summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano2015-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | grep: fix "--quiet" overwriting current outputws/grep-quiet-no-pagerWilhelm Schuermann2015-03-191-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jc/submitting-patches-mention-send-email' into maintJunio C Hamano2015-03-281-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SubmittingPatches: encourage users to use format-patch and send-emailjc/submitting-patches-mention-send-emailJunio C Hamano2015-03-151-0/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano2015-03-281-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clone: drop period from end of die_errno messagejk/cleanup-failed-cloneJeff King2015-03-191-1/+1
| * | | | | | | | | | | | | clone: initialize atexit cleanup handler earlierJeff King2015-03-191-4/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/fetch-pack' into maintJunio C Hamano2015-03-283-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fetch-pack: remove dead assignment to ref->new_sha1jk/fetch-packJeff King2015-03-191-3/+0
| * | | | | | | | | | | | | fetch_refs_via_pack: free extra copy of refsJeff King2015-03-191-3/+5
| * | | | | | | | | | | | | filter_ref: make a copy of extra "sought" entriesJeff King2015-03-192-6/+12
| * | | | | | | | | | | | | filter_ref: avoid overwriting ref->old_sha1 with garbageJeff King2015-03-191-1/+5
* | | | | | | | | | | | | | Merge branch 'tg/fix-check-order-with-split-index' into maintJunio C Hamano2015-03-281-19/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | read-cache: fix reading of split indextg/fix-check-order-with-split-indexThomas Gummerer2015-03-201-19/+23
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-287-68/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | refs.c: drop curate_packed_refsjk/prune-with-corrupt-refsJeff King2015-03-202-67/+2
| * | | | | | | | | | | | | | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-202-3/+7