diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-28 10:09:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 10:26:18 (GMT) |
| commit | 939aabbf7d108b5d6830bf5cd89abc910cc9ff27 (patch) | |
| tree | a8844082231917ae1010fea74f6d31fc370a59fb /Documentation/git-push.txt | |
| parent | addafaf92eeb86033da91323d0d3ad7a496dae83 (diff) | |
| download | git-939aabbf7d108b5d6830bf5cd89abc910cc9ff27.zip git-939aabbf7d108b5d6830bf5cd89abc910cc9ff27.tar.gz git-939aabbf7d108b5d6830bf5cd89abc910cc9ff27.tar.bz2 | |
diff-files -c/--cc: combine only when both ours and theirs exist.
The previous round forgot to make sure there actually are two
versions to compare against the working tree version. Otherwise
using -c/--cc would not make much sense.
Also plug a small memory leak.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-push.txt')
0 files changed, 0 insertions, 0 deletions