diff options
| author | Chris Shoemaker <c.shoemaker@cox.net> | 2005-10-28 21:04:49 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-29 00:37:38 +0400 |
| commit | 50b8e355b64c93a71d5008557e15f52c032240ff (patch) | |
| tree | 5958083eb0d27c933655ee5d77ef6848aaad2709 /git-merge.sh | |
| parent | f07a524195a73537d4187460ccbd072bcb1ff486 (diff) | |
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-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 3457a96cfd..6ad96ebfbb 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" } |