summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorChris Shoemaker <c.shoemaker@cox.net>2005-10-28 17:04:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-28 20:37:38 (GMT)
commit50b8e355b64c93a71d5008557e15f52c032240ff (patch)
tree5958083eb0d27c933655ee5d77ef6848aaad2709 /git-merge.sh
parentf07a524195a73537d4187460ccbd072bcb1ff486 (diff)
downloadgit-50b8e355b64c93a71d5008557e15f52c032240ff.zip
git-50b8e355b64c93a71d5008557e15f52c032240ff.tar.gz
git-50b8e355b64c93a71d5008557e15f52c032240ff.tar.bz2
Documentation changes to recursive option for git-diff-tree
Update docs and usages regarding '-r' recursive option for git-diff-tree. Remove '-r' from common diff options, mention it only for git-diff-tree. Remove one extraneous use of '-r' with git-diff-files in get-merge.sh. Sync the synopsis and usage string for git-diff-tree. Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 3457a96..6ad96eb 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -25,7 +25,7 @@ dropsave() {
savestate() {
# Stash away any local modifications.
- git-diff-index -r -z --name-only $head |
+ git-diff-index -z --name-only $head |
cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
}