Merge branch 'jh/checkout-auto-tracking' into maint

Junio C Hamano committed over 13 years ago

Update draft release notes to 1.8.4

Junio C Hamano committed over 13 years ago

Merge branch 'jk/add-i-custom-diff-algo'

Junio C Hamano committed over 13 years ago

Merge branch 'rr/cherry-pick-fast-forward-reflog-message'

Junio C Hamano committed over 13 years ago

Merge branch 'mt/send-email-cc-match-fix'

Junio C Hamano committed over 13 years ago

Merge branch 'jk/pull-into-dirty-unborn'

Junio C Hamano committed over 13 years ago

Merge branch 'bc/http-keep-memory-given-to-curl'

Junio C Hamano committed over 13 years ago

Merge branch 'bc/checkout-tracking-name-plug-leak'

Junio C Hamano committed over 13 years ago

Merge branch 'rr/rebase-stash-store'

Junio C Hamano committed over 13 years ago

rebase -i: handle fixup! fixup! in --autosquash

Andrew Pimlott committed over 13 years ago

am: replace uses of --resolved with --continue

Kevin Bracey committed over 13 years ago

Update draft release notes to 1.8.4

Junio C Hamano committed over 13 years ago

Merge branch 'tr/maint-apply-non-git-patch-parsefix'

Junio C Hamano committed over 13 years ago

Merge branch 'ys/cygstart'

Junio C Hamano committed over 13 years ago

Merge branch 'wk/doc-git-has-grown'

Junio C Hamano committed over 13 years ago

Merge branch 'vl/typofix'

Junio C Hamano committed over 13 years ago

Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'

Junio C Hamano committed over 13 years ago

Merge branch 'mm/merge-in-dirty-worktree-doc'

Junio C Hamano committed over 13 years ago

Merge branch 'kb/diff-blob-blob-doc'

Junio C Hamano committed over 13 years ago

Merge branch 'mm/push-force-is-dangerous'

Junio C Hamano committed over 13 years ago