summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib/subtree: there's no push --squashdl/subtree-push-no-squashDanny Lin2015-05-072-2/+2
* Git 2.3.7v2.3.7Junio C Hamano2015-04-274-3/+25
* Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-273-16/+24
|\
| * connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fixTorsten Bögershausen2015-04-083-16/+24
* | Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
|\ \
| * | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
* | | Merge branch 'jc/push-cert' into maintJunio C Hamano2015-04-271-0/+23
|\ \ \
| * | | push --signed: tighten what the receiving end can ask to signjc/push-certJunio C Hamano2015-04-021-0/+23
* | | | Git 2.3.6v2.3.6Junio C Hamano2015-04-214-3/+17
* | | | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
|\ \ \ \
| * | | | diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* | | | | Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-215-15/+24
|\ \ \ \ \
| * | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyancesJeff King2015-03-121-5/+14
| * | | | | t5541: move run_with_cmdline_limit to test-lib.shJeff King2015-03-122-6/+6
| * | | | | t: pass GIT_TRACE through ApacheJeff King2015-03-122-0/+2
| * | | | | t: redirect stderr GIT_TRACE to descriptor 4Jeff King2015-03-121-4/+1
| * | | | | t: translate SIGINT to an exitJeff King2015-03-121-0/+1
* | | | | | Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-211-8/+3
|\ \ \ \ \ \
| * | | | | | enter_repo(): fix docs to match codept/enter-repo-comment-fixPaul Tan2015-03-311-8/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jz/gitweb-conf-doc-fix' into maintJunio C Hamano2015-04-211-1/+1
|\ \ \ \ \ \
| * | | | | | gitweb.conf.txt: say "build-time", not "built-time"jz/gitweb-conf-doc-fixJérôme Zago2015-03-311-1/+1
* | | | | | | Merge branch 'jk/cherry-pick-docfix' into maintJunio C Hamano2015-04-211-1/+2
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick: fix docs describing handling of empty commitsjk/cherry-pick-docfixJeff King2015-03-301-1/+2
* | | | | | | | Merge branch 'iu/fix-parse-options-h-comment' into maintJunio C Hamano2015-04-211-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defvaliu/fix-parse-options-h-commentIvan Ukhov2015-03-291-2/+1
* | | | | | | | | Merge branch 'jg/cguide-we-cannot-count' into maintJunio C Hamano2015-04-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | CodingGuidelines: update 'rough' rule countjg/cguide-we-cannot-countJulian Gindi2015-04-141-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/pack-corruption-post-mortem' into maintJunio C Hamano2015-04-211-0/+237
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | howto: document more tools for recovery corruptionjk/pack-corruption-post-mortemJeff King2015-04-011-0/+237
* | | | | | | | | | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maintJunio C Hamano2015-04-211-4/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import doc: remove suggested 16-parent limitjn/doc-fast-import-no-16-octopus-limitJonathan Nieder2015-03-311-4/+0
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Git 2.3.5v2.3.5Junio C Hamano2015-03-313-2/+6
* | | | | | | | | | Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2015-03-312-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs: clarify what git-rebase's "-p" / "--preserve-merges" doesss/pull-rebase-preserveSebastian Schuberth2015-03-301-1/+3
| * | | | | | | | | | docs: clarify "preserve" option wording for git-pullSebastian Schuberth2015-03-261-3/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano2015-03-314-44/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | report_path_error(): move to dir.cjc/report-path-error-to-dirJunio C Hamano2015-03-244-44/+44
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ph/push-doc-cas' into maintJunio C Hamano2015-03-311-8/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-push.txt: clean up force-with-lease wordingph/push-doc-casPhil Hord2015-03-261-8/+6
| |/ / / / / / / / /
* | | | | | | | | | Prepare for 2.3.5Junio C Hamano2015-03-282-1/+42
* | | | | | | | | | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maintJunio C Hamano2015-03-281-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: use __gitcomp_nl() for completing refssg/completion-gitcomp-nl-for-refsSZEDER Gábor2015-03-221-2/+2
* | | | | | | | | | | Merge branch 'jk/simplify-csum-file-sha1fd-check' into maintJunio C Hamano2015-03-281-7/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sha1fd_check: die when we cannot open the filejk/simplify-csum-file-sha1fd-checkJeff King2015-03-191-7/+3
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tg/test-index-v4' into maintJunio C Hamano2015-03-281-3/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t1700: make test pass with index-v4tg/test-index-v4Thomas Gummerer2015-03-201-3/+12
* | | | | | | | | | | | Merge branch 'nd/doc-git-index-version' into maintJunio C Hamano2015-03-281-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git.txt: list index versions in plain Englishnd/doc-git-index-versionNguyễn Thái Ngọc Duy2015-03-241-1/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ct/prompt-untracked-fix' into maintJunio C Hamano2015-03-282-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fixCody A Taylor2015-03-152-1/+12
| |/ / / / / / / / / / /