@matheusbsbs / matheus-bagliano / commits / 207dfa0791
Fork 0

Remove git-resolve.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Feb 7, 2007 at 10:37 UTC 207dfa07919baba034291f1d5169f86272839d59
11 files changed +14 -59
.gitignore
-1
@@ -101,7 +101,6 @@ git-repo-config
101 git-request-pull
102 git-rerere
103 git-reset
104 -git-resolve
104 git-rev-list
105 git-rev-parse
106 git-revert
Documentation/cmd-list.perl
-1
@@ -149,7 +149,6 @@ git-config ancillarymanipulators
149 git-request-pull foreignscminterface
150 git-rerere ancillaryinterrogators
151 git-reset mainporcelain
152 -git-resolve mainporcelain
152 git-revert mainporcelain
153 git-rev-list plumbinginterrogators
154 git-rev-parse ancillaryinterrogators
Documentation/core-intro.txt
+2 -1
@@ -587,4 +587,5 @@ stages to temporary files and calls a "merge" script on it:
587
588 git-merge-index git-merge-one-file hello.c
589
590 -and that is what higher level `git resolve` is implemented with.
590 +and that is what higher level `git merge -s resolve` is implemented
591 +with.
Documentation/core-tutorial.txt
+4 -4
@@ -977,7 +977,7 @@ see more complex cases.
977 Now, let's pretend you are the one who did all the work in
978 `mybranch`, and the fruit of your hard work has finally been merged
979 to the `master` branch. Let's go back to `mybranch`, and run
980 -resolve to get the "upstream changes" back to your branch.
980 +`git merge` to get the "upstream changes" back to your branch.
981
982 ------------
983 $ git checkout mybranch
@@ -996,7 +996,7 @@ Fast forward
996 ----------------
997
998 Because your branch did not contain anything more than what are
999 -already merged into the `master` branch, the resolve operation did
999 +already merged into the `master` branch, the merge operation did
1000 not actually do a merge. Instead, it just updated the top of
1001 the tree of your branch to that of the `master` branch. This is
1002 often called 'fast forward' merge.
@@ -1099,11 +1099,11 @@ programs, which are 'commit walkers'; they outlived their
1099 usefulness when git Native and SSH transports were introduced,
1100 and not used by `git pull` or `git push` scripts.
1101
1102 -Once you fetch from the remote repository, you `resolve` that
1102 +Once you fetch from the remote repository, you `merge` that
1103 with your current branch.
1104
1105 However -- it's such a common thing to `fetch` and then
1106 -immediately `resolve`, that it's called `git pull`, and you can
1106 +immediately `merge`, that it's called `git pull`, and you can
1107 simply do
1108
1109 ----------------
Documentation/git-resolve.txt deleted
-38
@@ -1,38 +0,0 @@
1 -git-resolve(1)
2 -==============
3 -
4 -NAME
5 -----
6 -git-resolve - Merge two commits
7 -
8 -
9 -SYNOPSIS
10 ---------
11 -'git-resolve' <current> <merged> <message>
12 -
13 -DESCRIPTION
14 ------------
15 -DEPRECATED and will be removed in 1.5.1. Use `git-merge` instead.
16 -
17 -Given two commits and a merge message, merge the <merged> commit
18 -into <current> commit, with the commit log message <message>.
19 -
20 -When <current> is a descendant of <merged>, or <current> is an
21 -ancestor of <merged>, no new commit is created and the <message>
22 -is ignored. The former is informally called "already up to
23 -date", and the latter is often called "fast forward".
24 -
25 -
26 -Author
27 -------
28 -Written by Linus Torvalds <torvalds@osdl.org> and
29 -Dan Holmsand <holmsand@gmail.com>.
30 -
31 -Documentation
32 ---------------
33 -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
34 -
35 -GIT
36 ----
37 -Part of the gitlink:git[7] suite
38 -
Documentation/howto/revert-branch-rebase.txt
+1 -8
@@ -85,7 +85,7 @@ Fortunately I did not have to; what I have in the current branch
85
86 ------------------------------------------------
87 $ git checkout master
88 -$ git resolve master revert-c99 fast ;# this should be a fast forward
88 +$ git merge revert-c99 ;# this should be a fast forward
89 Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
90 cache.h | 8 ++++----
91 commit.c | 2 +-
@@ -95,13 +95,6 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
95 5 files changed, 8 insertions(+), 8 deletions(-)
96 ------------------------------------------------
97
98 -The 'fast' in the above 'git resolve' is not a magic. I knew this
99 -'resolve' would result in a fast forward merge, and if not, there is
100 -something very wrong (so I would do 'git reset' on the 'master' branch
101 -and examine the situation). When a fast forward merge is done, the
102 -message parameter to 'git resolve' is discarded, because no new commit
103 -is created. You could have said 'junk' or 'nothing' there as well.
104 -
98 There is no need to redo the test at this point. We fast forwarded
99 and we know 'master' matches 'revert-c99' exactly. In fact:
100
Documentation/user-manual.txt
+1 -1
@@ -2755,7 +2755,7 @@ stages to temporary files and calls a "merge" script on it:
2755 $ git-merge-index git-merge-one-file hello.c
2756 -------------------------------------------------
2757
2758 -and that is what higher level `git resolve` is implemented with.
2758 +and that is what higher level `git merge -s resolve` is implemented with.
2759
2760 How git stores objects efficiently: pack files
2761 ----------------------------------------------
Makefile
+1 -1
@@ -172,7 +172,7 @@ SCRIPT_SH = \
172 git-merge-one-file.sh git-parse-remote.sh \
173 git-pull.sh git-rebase.sh \
174 git-repack.sh git-request-pull.sh git-reset.sh \
175 - git-resolve.sh git-revert.sh git-sh-setup.sh \
175 + git-revert.sh git-sh-setup.sh \
176 git-tag.sh git-verify-tag.sh \
177 git-applymbox.sh git-applypatch.sh git-am.sh \
178 git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
contrib/completion/git-completion.bash
-1
@@ -298,7 +298,6 @@ __git_commands ()
298 reflog) : plumbing;;
299 repo-config) : plumbing;;
300 rerere) : plumbing;;
301 - resolve) : dead dont use;;
301 rev-list) : plumbing;;
302 rev-parse) : plumbing;;
303 runstatus) : plumbing;;
contrib/examples/git-resolve.sh renamed
t/t1200-tutorial.sh
+5 -3
@@ -101,7 +101,9 @@ echo "Play, play, play" >>hello
101 echo "Lots of fun" >>example
102 git commit -m 'Some fun.' -i hello example
103
104 -test_expect_failure 'git resolve now fails' 'git resolve HEAD mybranch "Merge work in mybranch"'
104 +test_expect_failure 'git resolve now fails' '
105 + git merge -m "Merge work in mybranch" mybranch
106 +'
107
108 cat > hello << EOF
109 Hello World
@@ -134,8 +136,8 @@ Updating from VARIABLE to VARIABLE
136 2 files changed, 2 insertions(+), 0 deletions(-)
137 EOF
138
137 -git resolve HEAD master "Merge upstream changes." | \
138 - sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" > resolve.output
139 +git merge -s "Merge upstream changes." master | \
140 + sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" >resolve.output
141 test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
142
143 cat > show-branch2.expect << EOF