rebase: define options in OPTIONS_SPEC

Martin von Zweigbergk committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

Merge branch 'mh/p4'

Junio C Hamano committed over 15 years ago

Merge branch 'mg/maint-difftool-vim-readonly'

Junio C Hamano committed over 15 years ago

Merge branch 'jn/maint-commit-missing-template'

Junio C Hamano committed over 15 years ago

Merge branch 'jk/diffstat-binary'

Junio C Hamano committed over 15 years ago

Merge branch 'lt/rename-no-extra-copy-detection'

Junio C Hamano committed over 15 years ago

Merge branch 'jn/test-terminal-punt-on-osx-breakage'

Junio C Hamano committed over 15 years ago

Merge branch 'jk/fail-null-clone'

Junio C Hamano committed over 15 years ago

Merge branch 'jc/grep--no-index-pathspec-fix'

Junio C Hamano committed over 15 years ago

apply: do not patch lines that were already patched

Junio C Hamano committed over 15 years ago

Documentation: fix a typo in git-apply.txt

Michał Kiedrowicz committed over 15 years ago

init: remove unnecessary check

Nguyễn Thái Ngọc Duy committed over 15 years ago

push: better error message when no remote configured

Matthieu Moy committed over 15 years ago

push: better error messages when push.default = tracking

Matthieu Moy committed over 15 years ago

Merge branch 'maint'

Junio C Hamano committed over 15 years ago

git-request-pull: open-code the only invocation of get_remote_url

Uwe Kleine-König committed over 15 years ago

get_remote_url(): use the same data source as ls-remote to get remote urls

Uwe Kleine-König committed over 15 years ago

rerere forget: deprecate invocation without pathspec

Johannes Sixt committed over 15 years ago

merge-recursive: When we detect we can skip an update, actually skip it

Elijah Newren committed over 15 years ago