diff --check: honor conflict-marker-size attribute
Junio C Hamano committed over 16 years ago
Merge branch 'jh/maint-submodule-status-in-void'
Junio C Hamano committed over 16 years ago
Merge branch 'tr/notes-display'
Junio C Hamano committed over 16 years ago
Merge branch 'jl/submodule-diff-dirtiness'
Junio C Hamano committed over 16 years ago
Merge branch 'pb/log-first-parent-p-m'
Junio C Hamano committed over 16 years ago
Merge branch 'jc/maint-refs-dangling'
Junio C Hamano committed over 16 years ago
Junio C Hamano committed over 16 years ago
Merge branch 'jc/color-attrs' into maint
Junio C Hamano committed over 16 years ago
Merge branch 'jk/maint-add-ignored-dir' into maint
Junio C Hamano committed over 16 years ago
Merge branch 'bg/apply-fix-blank-at-eof' into maint
Junio C Hamano committed over 16 years ago
Teach rebase the --no-ff option.
Marc Branchaud committed over 16 years ago
http-backend: Don't infinite loop during die()
Shawn O. Pearce committed over 16 years ago
Correct references to /usr/bin/python which does not exist on FreeBSD
R. Tyler Ballance committed over 16 years ago
Make xmalloc and xrealloc thread-safe
Nicolas Pitre committed over 16 years ago
Documentation: explain the meaning of "-g" in git-describe output
Markus Heidelberg committed over 16 years ago
rev-list: use default abbrev length when abbrev-commit is in effect
Michael J Gruber committed over 16 years ago
imap-send: Remove limitation on message body
Ramkumar Ramachandra committed over 16 years ago
Junio C Hamano committed over 16 years ago
Junio C Hamano committed over 16 years ago
Merge branch 'maint-1.6.6' into maint
Junio C Hamano committed over 16 years ago