Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'maint'
Tags
v1.7.3-rc0
Junio C Hamano
Merge branch 'xx/trivial' into maint
Junio C Hamano
tag.c: whitespace breakages fix
Jared Hance
Fix whitespace issue in object.c
Jens Lehmann
t5505: add missing &&
Junio C Hamano
Merge branch 'jl/submodule-ignore-diff'
Junio C Hamano
Merge branch 'ab/test-2'
Junio C Hamano
Merge branch 'js/detached-stash'
Junio C Hamano
Merge branch 'js/maint-reflog-beyond-horizon'
Junio C Hamano
Merge branch 'dg/local-mod-error-messages'
Junio C Hamano
Merge branch 'nd/maint-fix-replace'
Nguyễn Thái Ngọc Duy
parse_object: pass on the original sha1, not the replaced one
Junio C Hamano
Merge branch 'ab/compat-regex'
Junio C Hamano
Merge branch 'nd/clone-depth-zero'
Junio C Hamano
Merge branch 'jn/maint-doc-user-manual-html-doctype'
Junio C Hamano
Merge branch 'cb/maint-mergetool-no-tty'
Junio C Hamano
Merge branch 'jn/apply-filename-with-sp'
Junio C Hamano
Merge branch 'jn/merge-custom-no-trivial'
Junio C Hamano
Merge branch 'jc/maint-doc-em-dash'
Junio C Hamano
Merge branch 'mg/doc-bundle'
Junio C Hamano
Merge branch 'jn/doc-backslash'
Junio C Hamano
Merge branch 'jn/update-contrib-example-merge'
Junio C Hamano
Merge branch 'jn/merge-renormalize'
Junio C Hamano
Sync with 1.7.2.3
Junio C Hamano
Git 1.7.2.3
Tags
v1.7.2.3
Thiago Farina
builtin/merge_recursive.c: Add an usage string and make use of it.
Jens Lehmann
t7406 & t7407: add missing && at end of lines
Jens Lehmann
t7405: cd inside subshell instead of around
Matthieu Moy
t7609-merge-co-error-msgs: test non-fast forward case too.
Matthieu Moy
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
  1. Prev
  2. Next