verify_lock(): return 0/-1 rather than struct ref_lock *

Michael Haggerty committed over 11 years ago

clone: reorder --dissociate and --reference options

Jeff King committed over 11 years ago

clone: use OPT_STRING_LIST for --reference

Jeff King committed over 11 years ago

diff.c: --ws-error-highlight=<kind> option

Junio C Hamano committed over 11 years ago

diff.c: add emit_del_line() and emit_context_line()

Junio C Hamano committed over 11 years ago

Sync with 2.4.2

Junio C Hamano committed over 11 years ago

Git 2.4.2

Junio C Hamano committed over 11 years ago

Merge branch 'jk/still-interesting' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/hash-object' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/rebase-quiet-noop' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'sg/complete-decorate-full-not-long' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/stash-require-clean-index' into maint

Junio C Hamano committed over 11 years ago

Merge branch 'jk/git-no-more-argv0-path-munging' into maint

Junio C Hamano committed over 11 years ago

Fifth batch for 2.5 cycle

Junio C Hamano committed over 11 years ago

Merge branch 'nd/untracked-cache'

Junio C Hamano committed over 11 years ago

Merge branch 'rs/plug-leak-in-pack-bitmaps'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-ff-vs-merge-ff'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-log-n'

Junio C Hamano committed over 11 years ago