summaryrefslogtreecommitdiff
path: root/git.spec.in
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-06 16:45:42 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-06 10:04:00 -0800
commitfbe0b24ca53111208b8ecd920cc112d0be13f93c (patch)
tree81854df2fe2528bd4b332fc77d7ad28959d74220 /git.spec.in
parentba1f5f353775ddbf97bc0d543888783630693023 (diff)
downloadgit-fbe0b24ca53111208b8ecd920cc112d0be13f93c.tar.gz
merge-file: support -p and -q; fix compile warnings
Now merge-file also understands --stdout and --quiet options. While at it, two compile warnings were fixed. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git.spec.in')
0 files changed, 0 insertions, 0 deletions