move index_has_changes() from builtin/am.c to merge.c for reuse

Elijah Newren committed over 8 years ago

t6044: recursive can silently incorporate dirty changes in a merge

Elijah Newren committed over 8 years ago

commit doc: document that -c, -C, -F and --fixup with -m error

Ævar Arnfjörð Bjarmason committed over 8 years ago

t/helper/test-lazy-name-hash: fix compilation

Stefan Beller committed almost 9 years ago

t5573, t7612: clean up after unexpected success of 'pull' and 'merge'

Junio C Hamano committed almost 9 years ago

RelNotes: the tenth batch

Junio C Hamano committed almost 9 years ago

Merge branch 'ls/editor-waiting-message'

Junio C Hamano committed almost 9 years ago

Merge branch 'sg/setup-doc-update'

Junio C Hamano committed almost 9 years ago

Merge branch 'ar/unconfuse-three-dots'

Junio C Hamano committed almost 9 years ago

Merge branch 'tg/worktree-create-tracking'

Junio C Hamano committed almost 9 years ago

Merge branch 'gk/tracing-optimization'

Junio C Hamano committed almost 9 years ago

Merge branch 'bw/submodule-config-cleanup'

Junio C Hamano committed almost 9 years ago

Merge branch 'sb/clone-recursive-submodule-doc'

Junio C Hamano committed almost 9 years ago

Merge branch 'ls/git-gui-no-double-utf8-author-name'

Junio C Hamano committed almost 9 years ago

Merge branch 'bw/pathspec-match-submodule-boundary'

Junio C Hamano committed almost 9 years ago

Merge branch 'jt/diff-anchored-patience'

Junio C Hamano committed almost 9 years ago

Merge branch 'en/merge-recursive-icase-removal'

Junio C Hamano committed almost 9 years ago

Merge branch 'en/rename-progress'

Junio C Hamano committed almost 9 years ago

builtin/describe.c: describe a blob

Stefan Beller committed almost 9 years ago

http: support CURLPROXY_HTTPS

Wei Shuyu committed almost 9 years ago