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 /xdiff-interface.c | |
| parent | 2422f1ca3b94358e88f8508730a9d8ebcf020547 (diff) | |
| parent | fc095242b16d57bad1bfe089f919b9d6e6deda1b (diff) | |
| download | git-240c77c7146a58834cf7e425bde956b646c69024.tar.gz git-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 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions