lockfile: allow file locking to be retried with a timeout
Michael Haggerty committed over 11 years ago
rerere: exit silently on "forget" when rerere is disabled
Jeff King committed over 11 years ago
pull: remove --tags error in no merge candidates case
Paul Tan committed over 11 years ago
doc: convert AsciiDoc {?foo} to ifdef::foo[]
Jeff King committed over 11 years ago
Junio C Hamano committed over 11 years ago
Junio C Hamano committed over 11 years ago
Merge branch 'sb/line-log-plug-pairdiff-leak' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'sb/test-bitmap-free-at-end' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'nd/t1509-chroot-test' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'jk/type-from-string-gently' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'ep/fix-test-lib-functions-report' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'cn/bom-in-gitignore' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'jk/prune-mtime' into maint
Junio C Hamano committed over 11 years ago
Merge branch 'jk/init-core-worktree-at-root' into maint
Junio C Hamano committed over 11 years ago
log: do not shorten decoration names too early
Junio C Hamano committed over 11 years ago
log: decorate HEAD with branch name under --decorate=full, too
Junio C Hamano committed over 11 years ago
doc: put example URLs and emails inside literal backticks
Jeff King committed over 11 years ago
doc: drop backslash quoting of some curly braces
Jeff King committed over 11 years ago
doc: convert \--option to --option
Jeff King committed over 11 years ago
doc/add: reformat `--edit` option
Jeff King committed over 11 years ago