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

Merge branch 'fg/submodule-non-ascii-path'

Junio C Hamano committed over 13 years ago

documentation: add git:// transport security notice

Fraser Tweedale committed over 13 years ago

git-prompt.sh: add missing information in comments

Eduardo R. D'Avila committed over 13 years ago

git-prompt.sh: do not print duplicate clean color code

Eduardo R. D'Avila committed over 13 years ago

t9903: remove redundant tests

Eduardo R. D'Avila committed over 13 years ago

git-prompt.sh: refactor colored prompt code

Eduardo R. D'Avila committed over 13 years ago

t9903: add tests for git-prompt pcmode

Eduardo R. D'Avila committed over 13 years ago

pretty: --format output should honor logOutputEncoding

Alexey Shumkin committed over 13 years ago

pretty: Add failing tests: --format output should honor logOutputEncoding

Alexey Shumkin committed over 13 years ago