summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | prune: turn on ref_paranoia flagJeff King2015-03-202-2/+3
| * | | | refs: introduce a "ref paranoia" flagJeff King2015-03-204-0/+25
| * | | | t5312: test object deletion code paths in a corrupted repositoryJeff King2015-03-201-0/+114
* | | | | 2.3.2 release notes: typofixThomas Ackermann2015-03-281-1/+1
* | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano2015-03-271-2/+2
|\ \ \ \ \
| * | | | | tag: fix some mis-organized options in "-h" listingjk/tag-h-column-is-a-listing-optionJeff King2015-03-121-2/+2
* | | | | | Merge branch 'jk/smart-http-hide-refs' into maintJunio C Hamano2015-03-272-6/+21
|\ \ \ \ \ \
| * | | | | | upload-pack: do not check NULL return of lookup_unknown_objectjk/smart-http-hide-refsJeff King2015-03-121-2/+0
| * | | | | | upload-pack: fix transfer.hiderefs over smart-httpJeff King2015-03-122-4/+21
* | | | | | | Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintJunio C Hamano2015-03-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | contrib/completion: escape the forward slash in __git_match_ctagjs/completion-ctags-pattern-substitution-fixJohn Szakmeister2015-03-141-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update mailmap to spell out "Alexander Kuleshov"Junio C Hamano2015-03-271-0/+1
* | | | | | | Git 2.3.4v2.3.4Junio C Hamano2015-03-234-3/+36
* | | | | | | Merge branch 'rs/use-isxdigit' into maintJunio C Hamano2015-03-232-2/+2
|\ \ \ \ \ \ \
| * | | | | | | use isxdigit() for checking if a character is a hexadecimal digitrs/use-isxdigitRené Scharfe2015-03-102-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano2015-03-2310-13/+2
|\ \ \ \ \ \ \
| * | | | | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-0510-13/+2
| |/ / / / / /
* | | | | | | Merge branch 'ak/git-done-help-cleanup' into maintJunio C Hamano2015-03-231-3/+2
|\ \ \ \ \ \ \
| * | | | | | | git: make was_alias and done_help non-staticak/git-done-help-cleanupAlexander Kuleshov2015-03-061-3/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'sg/completion-remote' into maintJunio C Hamano2015-03-232-5/+21
|\ \ \ \ \ \ \
| * | | | | | | completion: simplify __git_remotes()sg/completion-remoteSZEDER Gábor2015-03-061-5/+2
| * | | | | | | completion: add a test for __git_remotes() helper functionSZEDER Gábor2015-03-061-0/+19
| |/ / / / / /
* | | | | | | Merge branch 'mg/doc-status-color-slot' into maintJunio C Hamano2015-03-232-2/+4
|\ \ \ \ \ \ \
| * | | | | | | config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-102-2/+5
| |/ / / / / /
* | | | | | | Merge branch 'jc/decorate-leaky-separator-color' into maintJunio C Hamano2015-03-233-57/+84
|\ \ \ \ \ \ \
| * | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-043-8/+16
| * | | | | | | Documentation/config.txt: simplify boolean description in the syntax sectionJunio C Hamano2015-03-041-2/+2
| * | | | | | | Documentation/config.txt: describe 'color' value type in the "Values" sectionJunio C Hamano2015-03-041-16/+13
| * | | | | | | Documentation/config.txt: have a separate "Values" sectionJunio C Hamano2015-03-041-8/+31
| * | | | | | | Documentation/config.txt: describe the structure first and then meaningJunio C Hamano2015-03-041-16/+15
| * | | | | | | Documentation/config.txt: explain multi-valued variables onceJunio C Hamano2015-03-041-4/+3