summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
* merge: grammofix in please-commit-before-merge messageAlex Henrie2015-10-022-2/+2
* pull: remove redirection to git-pull.shPaul Tan2015-06-183-8/+0
* pull --rebase: error on no merge candidate casesPaul Tan2015-06-181-3/+12
* pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-181-1/+76
* pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-181-1/+34
* pull: teach git pull about --rebasePaul Tan2015-06-181-2/+245
* pull: set reflog messagePaul Tan2015-06-181-0/+22
* pull: implement pulling into an unborn branchPaul Tan2015-06-181-1/+28
* pull: fast-forward working tree if head is updatedPaul Tan2015-06-181-0/+30
* pull: check if in unresolved merge statePaul Tan2015-06-183-0/+18
* pull: support pull.ff configPaul Tan2015-06-181-0/+29
* pull: error on no merge candidatesPaul Tan2015-06-181-0/+113
* pull: pass git-fetch's options to git-fetchPaul Tan2015-06-181-0/+95
* pull: pass git-merge's options to git-mergePaul Tan2015-06-151-0/+75
* pull: pass verbosity, --progress flags to fetch and mergePaul Tan2015-06-151-0/+36
* pull: implement fetch + mergePaul Tan2015-06-151-1/+61
* pull: implement skeletal builtin pullPaul Tan2015-06-154-0/+36
* argv-array: implement argv_array_pushv()Paul Tan2015-06-153-0/+10
* parse-options-cb: implement parse_opt_passthru_argv()Paul Tan2015-06-153-0/+29
* parse-options-cb: implement parse_opt_passthru()Paul Tan2015-06-153-0/+59
* Sync with 2.4.3Junio C Hamano2015-06-052-1/+78
|\
| * Git 2.4.3v2.4.3Junio C Hamano2015-06-054-3/+80
| * Merge branch 'dl/branch-error-message' into maintJunio C Hamano2015-06-051-3/+3
| |\
| * \ Merge branch 'jk/skip-http-tests-under-no-curl' into maintJunio C Hamano2015-06-058-35/+13
| |\ \
| * \ \ Merge branch 'ps/doc-packfile-vs-pack-file' into maintJunio C Hamano2015-06-053-9/+9
| |\ \ \
| * \ \ \ Merge branch 'fg/document-commit-message-stripping' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/rerere-forget-check-enabled' into maintJunio C Hamano2015-06-051-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'pt/pull-log-n' into maintJunio C Hamano2015-06-052-2/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'pt/pull-ff-vs-merge-ff' into maintJunio C Hamano2015-06-053-2/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs/plug-leak-in-pack-bitmaps' into maintJunio C Hamano2015-06-051-5/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ja/tutorial-asciidoctor-fix' into maintJunio C Hamano2015-06-051-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/stripspace-asciidoctor-fix' into maintJunio C Hamano2015-06-051-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/asciidoc-markup-fix' into maintJunio C Hamano2015-06-0519-102/+107
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/bundle-verify-arg' into maintJunio C Hamano2015-06-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/write-refs-sooner-2.4' into maintJunio C Hamano2015-06-053-33/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/ref-directory-file' into maintJunio C Hamano2015-06-053-118/+312
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/log-decorate-HEAD' into maintJunio C Hamano2015-06-052-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/t1020-cleanup' into maintJunio C Hamano2015-06-051-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/gitignore-precedence' into maintJunio C Hamano2015-06-052-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/connect-plink' into maintJunio C Hamano2015-06-052-22/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/rebase-i-redo' into maintJunio C Hamano2015-06-052-0/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/add-e-kill-editor' into maintJunio C Hamano2015-06-052-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/clone-verbosity-fix' into maintJunio C Hamano2015-06-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sha1-file-reduce-useless-warnings' into maintJunio C Hamano2015-06-052-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/blame-resurrect-convert-to-git' into maintJunio C Hamano2015-06-052-3/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/plug-fmt-merge-msg-leak' into maintJunio C Hamano2015-06-051-5/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-0510-81/+243
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | The first half of the seventh batch for 2.5Junio C Hamano2015-06-051-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ld/p4-editor-multi-words'Junio C Hamano2015-06-055-7/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status