Merge branch 'mt/p4-depotFile-at-version'
Junio C Hamano committed over 11 years ago
Merge branch 'mh/verify-lock-error-report'
Junio C Hamano committed over 11 years ago
Merge branch 'jk/color-diff-plain-is-context'
Junio C Hamano committed over 11 years ago
Merge branch 'jk/clone-dissociate'
Junio C Hamano committed over 11 years ago
Merge branch 'jc/diff-ws-error-highlight'
Junio C Hamano committed over 11 years ago
git-prompt.sh: document GIT_PS1_STATESEPARATOR
Joe Cridge committed over 11 years ago
Frans Klaver committed over 11 years ago
git-p4: fixing --changes-block-size handling
Luke Diamand committed over 11 years ago
git-p4: add tests for non-numeric revision range
Luke Diamand committed over 11 years ago
setup: add gentle version of read_gitfile
Erik Elfström committed over 11 years ago
index-pack: avoid excessive re-reading of pack directory
Jeff King committed over 11 years ago
commit: cope with scissors lines in commit message
SZEDER Gábor committed over 11 years ago
git-completion.tcsh: fix redirect with noclobber
Ariel Faigon committed over 11 years ago
am --abort: keep unrelated commits on unborn branch
Paul Tan committed over 11 years ago
am --abort: support aborting to unborn branch
Paul Tan committed over 11 years ago
am --abort: revert changes introduced by failed 3way merge
Paul Tan committed over 11 years ago
am --skip: support skipping while on unborn branch
Paul Tan committed over 11 years ago
am -3: support 3way merge on unborn branch
Paul Tan committed over 11 years ago
am --skip: revert changes introduced by failed 3way merge
Paul Tan committed over 11 years ago
t4150: test applying StGit patch
Paul Tan committed over 11 years ago