Merge branch 'jc/deprecate'
As previously announced, diff-stages and resolve are now gone.
This commit is contained in:
Junio C Hamano
@ -90,7 +90,6 @@ git-describe mainporcelain
|
||||
git-diff-files plumbinginterrogators
|
||||
git-diff-index plumbinginterrogators
|
||||
git-diff mainporcelain
|
||||
git-diff-stages plumbinginterrogators
|
||||
git-diff-tree plumbinginterrogators
|
||||
git-fast-import ancillarymanipulators
|
||||
git-fetch mainporcelain
|
||||
@ -149,7 +148,6 @@ git-config ancillarymanipulators
|
||||
git-request-pull foreignscminterface
|
||||
git-rerere ancillaryinterrogators
|
||||
git-reset mainporcelain
|
||||
git-resolve mainporcelain
|
||||
git-revert mainporcelain
|
||||
git-rev-list plumbinginterrogators
|
||||
git-rev-parse ancillaryinterrogators
|
||||
|
||||
@ -587,4 +587,5 @@ stages to temporary files and calls a "merge" script on it:
|
||||
|
||||
git-merge-index git-merge-one-file hello.c
|
||||
|
||||
and that is what higher level `git resolve` is implemented with.
|
||||
and that is what higher level `git merge -s resolve` is implemented
|
||||
with.
|
||||
|
||||
@ -977,7 +977,7 @@ see more complex cases.
|
||||
Now, let's pretend you are the one who did all the work in
|
||||
`mybranch`, and the fruit of your hard work has finally been merged
|
||||
to the `master` branch. Let's go back to `mybranch`, and run
|
||||
resolve to get the "upstream changes" back to your branch.
|
||||
`git merge` to get the "upstream changes" back to your branch.
|
||||
|
||||
------------
|
||||
$ git checkout mybranch
|
||||
@ -996,7 +996,7 @@ Fast forward
|
||||
----------------
|
||||
|
||||
Because your branch did not contain anything more than what are
|
||||
already merged into the `master` branch, the resolve operation did
|
||||
already merged into the `master` branch, the merge operation did
|
||||
not actually do a merge. Instead, it just updated the top of
|
||||
the tree of your branch to that of the `master` branch. This is
|
||||
often called 'fast forward' merge.
|
||||
@ -1099,11 +1099,11 @@ programs, which are 'commit walkers'; they outlived their
|
||||
usefulness when git Native and SSH transports were introduced,
|
||||
and not used by `git pull` or `git push` scripts.
|
||||
|
||||
Once you fetch from the remote repository, you `resolve` that
|
||||
Once you fetch from the remote repository, you `merge` that
|
||||
with your current branch.
|
||||
|
||||
However -- it's such a common thing to `fetch` and then
|
||||
immediately `resolve`, that it's called `git pull`, and you can
|
||||
immediately `merge`, that it's called `git pull`, and you can
|
||||
simply do
|
||||
|
||||
----------------
|
||||
|
||||
@ -6,8 +6,8 @@ June 2005
|
||||
Introduction
|
||||
------------
|
||||
|
||||
The diff commands git-diff-index, git-diff-files, git-diff-tree, and
|
||||
git-diff-stages can be told to manipulate differences they find in
|
||||
The diff commands git-diff-index, git-diff-files, and git-diff-tree
|
||||
can be told to manipulate differences they find in
|
||||
unconventional ways before showing diff(1) output. The manipulation
|
||||
is collectively called "diffcore transformation". This short note
|
||||
describes what they are and how to use them to produce diff outputs
|
||||
@ -30,9 +30,6 @@ files:
|
||||
|
||||
- git-diff-tree compares contents of two "tree" objects;
|
||||
|
||||
- git-diff-stages compares contents of blobs at two stages in an
|
||||
unmerged index file.
|
||||
|
||||
In all of these cases, the commands themselves compare
|
||||
corresponding paths in the two sets of files. The result of
|
||||
comparison is passed from these commands to what is internally
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
git-diff-stages(1)
|
||||
==================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-diff-stages - Compares two merge stages in the index
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-diff-stages' [<common diff options>] <stage1> <stage2> [<path>...]
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
DEPRECATED and will be removed in 1.5.1.
|
||||
|
||||
Compares the content and mode of the blobs in two stages in an
|
||||
unmerged index file.
|
||||
|
||||
OPTIONS
|
||||
-------
|
||||
include::diff-options.txt[]
|
||||
|
||||
<stage1>,<stage2>::
|
||||
The stage number to be compared.
|
||||
|
||||
Output format
|
||||
-------------
|
||||
include::diff-format.txt[]
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Junio C Hamano <junkio@cox.net>
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by Junio C Hamano.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the gitlink:git[7] suite
|
||||
@ -1,38 +0,0 @@
|
||||
git-resolve(1)
|
||||
==============
|
||||
|
||||
NAME
|
||||
----
|
||||
git-resolve - Merge two commits
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-resolve' <current> <merged> <message>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
DEPRECATED and will be removed in 1.5.1. Use `git-merge` instead.
|
||||
|
||||
Given two commits and a merge message, merge the <merged> commit
|
||||
into <current> commit, with the commit log message <message>.
|
||||
|
||||
When <current> is a descendant of <merged>, or <current> is an
|
||||
ancestor of <merged>, no new commit is created and the <message>
|
||||
is ignored. The former is informally called "already up to
|
||||
date", and the latter is often called "fast forward".
|
||||
|
||||
|
||||
Author
|
||||
------
|
||||
Written by Linus Torvalds <torvalds@osdl.org> and
|
||||
Dan Holmsand <holmsand@gmail.com>.
|
||||
|
||||
Documentation
|
||||
--------------
|
||||
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the gitlink:git[7] suite
|
||||
|
||||
@ -85,7 +85,7 @@ Fortunately I did not have to; what I have in the current branch
|
||||
|
||||
------------------------------------------------
|
||||
$ git checkout master
|
||||
$ git resolve master revert-c99 fast ;# this should be a fast forward
|
||||
$ git merge revert-c99 ;# this should be a fast forward
|
||||
Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
|
||||
cache.h | 8 ++++----
|
||||
commit.c | 2 +-
|
||||
@ -95,13 +95,6 @@ Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
------------------------------------------------
|
||||
|
||||
The 'fast' in the above 'git resolve' is not a magic. I knew this
|
||||
'resolve' would result in a fast forward merge, and if not, there is
|
||||
something very wrong (so I would do 'git reset' on the 'master' branch
|
||||
and examine the situation). When a fast forward merge is done, the
|
||||
message parameter to 'git resolve' is discarded, because no new commit
|
||||
is created. You could have said 'junk' or 'nothing' there as well.
|
||||
|
||||
There is no need to redo the test at this point. We fast forwarded
|
||||
and we know 'master' matches 'revert-c99' exactly. In fact:
|
||||
|
||||
|
||||
@ -2755,7 +2755,7 @@ stages to temporary files and calls a "merge" script on it:
|
||||
$ git-merge-index git-merge-one-file hello.c
|
||||
-------------------------------------------------
|
||||
|
||||
and that is what higher level `git resolve` is implemented with.
|
||||
and that is what higher level `git merge -s resolve` is implemented with.
|
||||
|
||||
How git stores objects efficiently: pack files
|
||||
----------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user