diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:53:52 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:53:52 -0700 |
commit | 240c77c7146a58834cf7e425bde956b646c69024 (patch) | |
tree | 19710f73b22c9962f6cb6979db5bf8bd413af323 /diff.h | |
parent | Merge branch 'jc/boundary' (diff) | |
parent | git-send-email: Document configuration options (diff) | |
download | tgif-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