Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mingw: add a regression test for pushing to UNC pathsjs/mingw-test-push-unc-path | Johannes Schindelin | 2017-01-07 | 1 | -0/+48 |
* | Third batch for 2.12 | Junio C Hamano | 2016-12-21 | 1 | -0/+40 |
* | Merge branch 'jt/mailinfo-fold-in-body-headers' | Junio C Hamano | 2016-12-21 | 1 | -1/+2 |
|\ | |||||
| * | mailinfo.c: move side-effects outside of assertjt/mailinfo-fold-in-body-headers | Kyle J. McKay | 2016-12-20 | 1 | -1/+2 |
* | | Merge branch 'jk/index-pack-wo-repo-from-stdin' | Junio C Hamano | 2016-12-21 | 7 | -47/+42 |
|\ \ | |||||
| * | | index-pack: skip collision check when not in repositoryjk/index-pack-wo-repo-from-stdin | Jeff King | 2016-12-16 | 1 | -4/+6 |
| * | | t: use nongit() function where applicable | Jeff King | 2016-12-16 | 3 | -29/+5 |
| * | | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 | 2 | -0/+17 |
| * | | t5000: extract nongit function to test-lib-functions.sh | Jeff King | 2016-12-16 | 2 | -14/+14 |
* | | | Merge branch 'jk/parseopt-usage-msg-opt' | Junio C Hamano | 2016-12-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | parse-options: print "fatal:" before usage_msg_opt()jk/parseopt-usage-msg-opt | Jeff King | 2016-12-14 | 1 | -1/+1 |
* | | | | Merge branch 'jk/quote-env-path-list-component' | Junio C Hamano | 2016-12-21 | 5 | -12/+102 |
|\ \ \ \ | |||||
| * | | | | t5615-alternate-env: double-quotes in file names do not work on Windows | Johannes Sixt | 2016-12-21 | 1 | -1/+1 |
| * | | | | t5547-push-quarantine: run the path separator test on Windows, too | Johannes Sixt | 2016-12-13 | 1 | -4/+10 |
| * | | | | tmp-objdir: quote paths we add to alternates | Jeff King | 2016-12-12 | 2 | -1/+36 |
| * | | | | alternates: accept double-quoted paths | Jeff King | 2016-12-12 | 3 | -11/+60 |
| * | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-component | Junio C Hamano | 2016-12-12 | 2 | -1/+72 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'vs/submodule-clone-nested-submodules-alternates' | Junio C Hamano | 2016-12-21 | 2 | -2/+83 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule--helper: set alternateLocation for cloned submodulesvs/submodule-clone-nested-submodules-alternates | Vitaly "_Vi" Shukela | 2016-12-12 | 2 | -2/+83 |
* | | | | | | | Merge branch 'nd/shallow-fixup' | Junio C Hamano | 2016-12-21 | 1 | -19/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | shallow.c: remove useless codend/shallow-fixup | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -4/+0 |
| * | | | | | | | shallow.c: bit manipulation tweaks | Rasmus Villemoes | 2016-12-07 | 1 | -4/+4 |
| * | | | | | | | shallow.c: avoid theoretical pointer wrap-around | Rasmus Villemoes | 2016-12-07 | 1 | -1/+1 |
| * | | | | | | | shallow.c: make paint_alloc slightly more robust | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -0/+3 |
| * | | | | | | | shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -2/+4 |
| * | | | | | | | shallow.c: rename fields in paint_info to better express their purposes | Nguyễn Thái Ngọc Duy | 2016-12-07 | 1 | -9/+9 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sb/sequencer-abort-safety' | Junio C Hamano | 2016-12-21 | 3 | -2/+61 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "sequencer: remove useless get_dir() function"sb/sequencer-abort-safety | Junio C Hamano | 2016-12-14 | 1 | -1/+6 |
| * | | | | | | | sequencer: remove useless get_dir() function | Stephan Beyer | 2016-12-09 | 1 | -6/+1 |
| * | | | | | | | sequencer: make sequencer abort safer | Stephan Beyer | 2016-12-09 | 2 | -1/+50 |
| * | | | | | | | t3510: test that cherry-pick --abort does not unsafely change HEAD | Stephan Beyer | 2016-12-09 | 1 | -0/+10 |
| * | | | | | | | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 | 1 | -1/+1 |
| * | | | | | | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 | 1 | -1/+1 |
* | | | | | | | | Second batch for 2.12 | Junio C Hamano | 2016-12-19 | 1 | -3/+90 |
* | | | | | | | | Merge branch 'kh/tutorial-grammofix' | Junio C Hamano | 2016-12-19 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: omit needless "for"kh/tutorial-grammofix | Kristoffer Haugsbakk | 2016-12-09 | 1 | -1/+1 |
| * | | | | | | | | doc: make the intent of sentence clearer | Kristoffer Haugsbakk | 2016-12-09 | 1 | -1/+1 |
| * | | | | | | | | doc: add verb in front of command to run | Kristoffer Haugsbakk | 2016-12-09 | 1 | -1/+1 |
| * | | | | | | | | doc: add articles (grammar) | Kristoffer Haugsbakk | 2016-12-09 | 1 | -3/+3 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'da/mergetool-xxdiff-hotkey' | Junio C Hamano | 2016-12-19 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mergetools: fix xxdiff hotkeysda/mergetool-xxdiff-hotkey | David Aguilar | 2016-12-11 | 1 | -5/+5 |
* | | | | | | | | | Merge branch 'lr/doc-fix-cet' | Junio C Hamano | 2016-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | date-formats.txt: Typo fixlr/doc-fix-cet | Luis Ressel | 2016-12-12 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'sb/t3600-cleanup' | Junio C Hamano | 2016-12-19 | 1 | -73/+51 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3600: slightly modernize stylesb/t3600-cleanup | Stefan Beller | 2016-12-12 | 1 | -73/+51 |
| * | | | | | | | | | | t3600: remove useless redirect | Stefan Beller | 2016-12-05 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 2016-12-19 | 2 | -4/+35 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ff | Junio C Hamano | 2016-11-29 | 2 | -4/+35 |
* | | | | | | | | | | | | Merge branch 'ld/p4-worktree' | Junio C Hamano | 2016-12-19 | 3 | -4/+65 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: support git worktreesld/p4-worktree | Luke Diamand | 2016-12-13 | 3 | -4/+65 |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |