diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-02 17:17:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-02 17:17:26 (GMT) |
| commit | bdc4204119d2847ea8f1ae5e44614be859951822 (patch) | |
| tree | ff641c05a79b4e5eb6d0428a2d6e2c55fe0935e9 /diffcore-break.c | |
| parent | 225c93a3cac93e8c619e5c8af47d2a781eedcacd (diff) | |
| parent | 761a889a97a33d277f8a6607a4696164391f9d5d (diff) | |
| download | git-bdc4204119d2847ea8f1ae5e44614be859951822.zip git-bdc4204119d2847ea8f1ae5e44614be859951822.tar.gz git-bdc4204119d2847ea8f1ae5e44614be859951822.tar.bz2 | |
Merge branch 'maint'
* maint:
git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX
Documentation: A...B shortcut for checkout and rebase
Documentation/pretty-{formats,options}: better reference for "format:<string>"
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions