Merge branch 'jc/prompt-document-ps1-state-separator'

Junio C Hamano committed over 11 years ago

Merge branch 'mm/describe-doc'

Junio C Hamano committed over 11 years ago

Merge branch 'da/mergetool-winmerge'

Junio C Hamano committed over 11 years ago

rev-list: disable --use-bitmap-index when pruning commits

Jeff King committed over 11 years ago

Add tests for wildcard "path vs ref" disambiguation

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

fast-import: add a get-mark command

Michael Haggerty committed over 11 years ago

rev-list: add --count to usage guide

Lawrence Siebert committed over 11 years ago

l10n: fr.po v2.5.0-rc0 (2355t)

Jean-Noel Avila committed over 11 years ago

git rebase -i: add static check for commands and SHA-1

Galan Rémi committed over 11 years ago

git rebase -i: warn about removed commits

Galan Rémi committed over 11 years ago

git-rebase -i: add command "drop" to remove a commit

Galan Rémi committed over 11 years ago

send-email: minor code refactoring

Remi Lespinet committed over 11 years ago

send-email: allow use of aliases in the From field of --compose mode

Remi Lespinet committed over 11 years ago

send-email: refactor address list process

Remi Lespinet committed over 11 years ago

t9001-send-email: refactor header variable fields replacement

Remi Lespinet committed over 11 years ago

send-email: allow aliases in patch header and command script outputs

Remi Lespinet committed over 11 years ago

t9001-send-email: move script creation in a setup test

Remi Lespinet committed over 11 years ago

status: differentiate interactive from non-interactive rebases

Guillaume Pagès committed over 11 years ago

status: factor two rebase-related messages together

Guillaume Pagès committed over 11 years ago

config.c: fix writing config files on Windows network shares

Karsten Blees committed over 11 years ago