Update howto using-topic-branches
"git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Luck, Tony committed
Nov 8, 2005 at 15:52 UTC
f37d0cc3ff6ef565f961a0d3741ba016e1ceb31d
1 file changed
+7
-7
Documentation/howto/using-topic-branches.txt
+7
-7
@@ -9,7 +9,7 @@ GIT as a Linux subsystem maintainer.
9
10
-Tony
11
12
-Last updated w.r.t. GIT 0.99.5
12
+Last updated w.r.t. GIT 0.99.9f
13
14
Linux subsystem maintenance using GIT
15
-------------------------------------
@@ -89,8 +89,8 @@ out at the current tip of the linus branch.
89
90
These can be easily kept up to date by merging from the "linus" branch:
91
92
- $ git checkout test && git resolve test linus "Auto-update from upstream"
93
- $ git checkout release && git resolve release linus "Auto-update from upstream"
92
+ $ git checkout test && git merge "Auto-update from upstream" test linus
93
+ $ git checkout release && git merge "Auto-update from upstream" release linus
94
95
Set up so that you can push upstream to your public tree (you need to
96
log-in to the remote system and create an empty tree there before the
@@ -128,7 +128,7 @@ commit to this branch.
128
When you are happy with the state of this change, you can pull it into the
129
"test" branch in preparation to make it public:
130
131
- $ git checkout test && git resolve test speed-up-spinlocks "Pull speed-up-spinlock changes"
131
+ $ git checkout test && git merge "Pull speed-up-spinlock changes" test speed-up-spinlocks
132
133
It is unlikely that you would have any conflicts here ... but you might if you
134
spent a while on this step and had also pulled new versions from upstream.
@@ -138,7 +138,7 @@ same branch into the "release" tree ready to go upstream. This is where you
138
see the value of keeping each patch (or patch series) in its own branch. It
139
means that the patches can be moved into the "release" tree in any order.
140
141
- $ git checkout release && git resolve release speed-up-spinlocks "Pull speed-up-spinlock changes"
141
+ $ git checkout release && git merge "Pull speed-up-spinlock changes" release speed-up-spinlocks
142
143
After a while, you will have a number of branches, and despite the
144
well chosen names you picked for each of them, you may forget what
@@ -190,7 +190,7 @@ Here are some of the scripts that I use to simplify all this even further.
190
191
case "$1" in
192
test|release)
193
- git checkout $1 && git resolve $1 linus "Auto-update from upstream"
193
+ git checkout $1 && git merge "Auto-update from upstream" $1 linus
194
;;
195
linus)
196
before=$(cat .git/refs/heads/linus)
@@ -231,7 +231,7 @@ test|release)
231
echo $1 already merged into $2 1>&2
232
exit 1
233
fi
234
- git checkout $2 && git resolve $2 $1 "Pull $1 into $2 branch"
234
+ git checkout $2 && git merge "Pull $1 into $2 branch" $2 $1
235
;;
236
*)
237
usage