diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-06 07:21:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-06 07:21:03 (GMT) |
| commit | 125a5f1c2a93f217e92dd88210c2cb503032c02f (patch) | |
| tree | adfe643504e7bfa6b3bdaf47b9ff5df3d5ba7349 /xdiff/xprepare.c | |
| parent | cc0e6c5adc783bcb29954f3a0b7a6197bcc9b1b3 (diff) | |
| parent | e102d4353d7cfd69a597cd976eabdcb74641be69 (diff) | |
| download | git-125a5f1c2a93f217e92dd88210c2cb503032c02f.zip git-125a5f1c2a93f217e92dd88210c2cb503032c02f.tar.gz git-125a5f1c2a93f217e92dd88210c2cb503032c02f.tar.bz2 | |
Merge branch 'maint'
* maint:
Small correction in reading of commit headers
Documentation: fix typo in git-remote.txt
Add test for blame corner cases.
blame: -C -C -C
blame: Notice a wholesale incorporation of an existing file.
Fix --boundary output
diff format documentation: describe raw combined diff format
Mention version 1.5.1 in tutorial and user-manual
Add --no-rebase option to git-svn dcommit
Fix markup in git-svn man page
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions