summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-03-11 23:53:52 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-03-11 23:53:52 -0700
commit240c77c7146a58834cf7e425bde956b646c69024 (patch)
tree19710f73b22c9962f6cb6979db5bf8bd413af323 /diff.h
parentMerge branch 'jc/boundary' (diff)
parentgit-send-email: Document configuration options (diff)
downloadtgif-240c77c7146a58834cf7e425bde956b646c69024.tar.xz
Merge branch 'maint'
* maint: git-send-email: Document configuration options git-merge: warn when -m provided on a fast forward
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions