commit: describe that --no-verify skips the commit-msg hook in the help text

Orgad Shaneh committed about 10 years ago

am -3: use merge_recursive() directly again

Johannes Schindelin committed about 10 years ago

merge-recursive: switch to returning errors instead of dying

Johannes Schindelin committed about 10 years ago

merge-recursive: handle return values indicating errors

Johannes Schindelin committed about 10 years ago

merge-recursive: allow write_tree_from_memory() to error out

Johannes Schindelin committed about 10 years ago

merge-recursive: avoid returning a wholesale struct

Johannes Schindelin committed about 10 years ago

merge_recursive: abort properly upon errors

Johannes Schindelin committed about 10 years ago

prepare the builtins for a libified merge_recursive()

Johannes Schindelin committed about 10 years ago

merge-recursive: clarify code in was_tracked()

Johannes Schindelin committed about 10 years ago

die(_("BUG")): avoid translating bug messages

Johannes Schindelin committed about 10 years ago

die("bug"): report bugs consistently

Johannes Schindelin committed about 10 years ago

t5520: verify that `pull --rebase` shows the helpful advice when failing

Johannes Schindelin committed about 10 years ago

t5510: skip tests under GETTEXT_POISON build

Vasco Almeida committed about 10 years ago

config.mak.uname: correct perl path on FreeBSD

Nguyễn Thái Ngọc Duy committed about 10 years ago

Documentation/git-push: fix placeholder formatting

John Keeping committed about 10 years ago

Seventh batch of topics for 2.10

Junio C Hamano committed about 10 years ago

Merge branch 'rs/use-strbuf-addbuf'

Junio C Hamano committed about 10 years ago

Merge branch 'ew/autoconf-pthread'

Junio C Hamano committed about 10 years ago

Merge branch 'mh/blame-worktree'

Junio C Hamano committed about 10 years ago

Merge branch 'js/fsck-name-object'

Junio C Hamano committed about 10 years ago