Merge branch 'rs/fmt-merge-msg-string-leak-fix'

Junio C Hamano committed over 8 years ago

Merge branch 'rs/am-builtin-leakfix'

Junio C Hamano committed over 8 years ago

Merge branch 'es/worktree-checkout-hook'

Junio C Hamano committed over 8 years ago

Merge branch 'lb/rebase-i-short-command-names'

Junio C Hamano committed over 8 years ago

Merge branch 'tb/check-crlf-for-safe-crlf'

Junio C Hamano committed over 8 years ago

Merge branch 'jh/object-filtering'

Junio C Hamano committed over 8 years ago

sequencer.c: drop 'const' from function return type

Junio C Hamano committed over 8 years ago

describe: prepend "tags/" when describing tags with embedded name

Daniel Knittl-Frank committed almost 9 years ago

strbuf: fix urlencode format string on signed char

Julien Dusser committed over 8 years ago

sequencer: assign only free()able strings to gpg_sign

Johannes Schindelin committed over 8 years ago

send-pack: use internal argv_array of struct child_process

René Scharfe committed over 8 years ago

http: use internal argv_array of struct child_process

René Scharfe committed over 8 years ago

git-p4: update multiple shelved change lists

Luke Diamand committed over 8 years ago

commit: add support for --fixup <commit> -m"<extra message>"

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

check-non-portable-shell.pl: `wc -l` may have leading WS

Torsten Bögershausen committed over 8 years ago

config.txt: document behavior of backslashes in subsections

Dave Borowitz committed over 8 years ago

Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index

Junio C Hamano committed over 8 years ago

merge-recursive: avoid incorporating uncommitted changes in a merge

Elijah Newren committed over 8 years ago

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