Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'

Junio C Hamano committed over 12 years ago

git-prompt.sh: don't assume the shell expands the value of PS1

Richard Hansen committed over 12 years ago

rebase -i: handle "Nothing to do" case with autostash

Ramkumar Ramachandra committed over 12 years ago

rebase --keep-empty -i: add test

Michael S. Tsirkin committed over 12 years ago

Documentation: replace: describe new --edit option

Christian Couder committed over 12 years ago

replace: add --edit to usage string

Christian Couder committed over 12 years ago

replace: add tests for --edit

Christian Couder committed over 12 years ago

replace: die early if replace ref already exists

Christian Couder committed over 12 years ago

replace: refactor checking ref validity

Christian Couder committed over 12 years ago

replace: make sure --edit results in a different object

Christian Couder committed over 12 years ago

commit: allow core.commentChar=auto for character auto selection

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

config: be strict on core.commentChar

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

t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs

Alexey Shumkin committed over 12 years ago

Merge branch 'lt/request-pull'

Junio C Hamano committed over 12 years ago

Merge branch 'jl/use-vsatisfy-correctly-for-2.0'

Junio C Hamano committed over 12 years ago

Merge git://github.com/git-l10n/git-po

Junio C Hamano committed over 12 years ago

Merge branch 'kb/fast-hashmap'

Junio C Hamano committed over 12 years ago

Documentation/technical/api-hashmap: remove source highlighting

Anders Kaseorg committed over 12 years ago

git-gui: tolerate major version changes when comparing the git version

Jens Lehmann committed over 12 years ago

fr: a lot of good fixups

Grégoire Paris committed over 12 years ago