summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bash-completion: add support for git-log --merges= and log.mergeskk/log-merges-configKoosha Khajehmoogahi2015-04-211-1/+10
* t4202-log: add tests for --merges=Koosha Khajehmoogahi2015-04-041-0/+84
* Documentation: add git-log --merges= option and log.merges config. varKoosha Khajehmoogahi2015-04-042-3/+18
* log: honor log.merges= optionJunio C Hamano2015-04-041-0/+6
* revision: add --merges={show|only|hide} optionJunio C Hamano2015-04-042-0/+21
* Git 2.4.0-rc1v2.4.0-rc1Junio C Hamano2015-04-022-3/+4
* Merge branch 'sb/atomic-push'Junio C Hamano2015-04-021-1/+1
|\
| * send-pack: unify error messages for unsupported capabilitiessb/atomic-pushRalf Thielow2015-04-021-1/+1
* | Sync with 2.3.5Junio C Hamano2015-03-313-2/+8
|\ \
| * | 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
| * | | Merge branch 'jc/report-path-error-to-dir' into maintJunio C Hamano2015-03-314-44/+44
| |\ \ \
| * \ \ \ Merge branch 'ph/push-doc-cas' into maintJunio C Hamano2015-03-311-8/+6
| |\ \ \ \
* | \ \ \ \ Sync with maintJunio C Hamano2015-03-282-1/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/simplify-csum-file-sha1fd-check' into maintJunio C Hamano2015-03-281-7/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tg/test-index-v4' into maintJunio C Hamano2015-03-281-3/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'nd/doc-git-index-version' into maintJunio C Hamano2015-03-281-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ct/prompt-untracked-fix' into maintJunio C Hamano2015-03-282-1/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ws/grep-quiet-no-pager' into maintJunio C Hamano2015-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/submitting-patches-mention-send-email' into maintJunio C Hamano2015-03-281-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/cleanup-failed-clone' into maintJunio C Hamano2015-03-281-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-pack' into maintJunio C Hamano2015-03-283-13/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/fix-check-order-with-split-index' into maintJunio C Hamano2015-03-281-19/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/prune-with-corrupt-refs' into maintJunio C Hamano2015-03-287-68/+147
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 2.3.2 release notes: typofixThomas Ackermann2015-03-281-1/+1
* | | | | | | | | | | | | | | | | RelNotes: minor doc updatesJunio C Hamano2015-03-281-1/+3
* | | | | | | | | | | | | | | | | Merge branch 'ph/push-doc-cas'Junio C Hamano2015-03-281-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | git-push.txt: clean up force-with-lease wordingph/push-doc-casPhil Hord2015-03-261-8/+6
* | | | | | | | | | | | | | | | | Merge branch 'ss/pull-rebase-preserve'Junio C Hamano2015-03-281-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | docs: clarify "preserve" option wording for git-pullSebastian Schuberth2015-03-261-3/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jn/doc-api-errors'Junio C Hamano2015-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | api-error-handling doc: typofixjn/doc-api-errorsThomas Ackermann2015-03-281-1/+1
* | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-03-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' into maintJunio C Hamano2015-03-271-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/smart-http-hide-refs' into maintJunio C Hamano2015-03-272-6/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/completion-ctags-pattern-substitution-fix' into maintJunio C Hamano2015-03-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update mailmap to spell out "Alexander Kuleshov"Junio C Hamano2015-03-271-0/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'sb/leaks'Junio C Hamano2015-03-278-15/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | http: release the memory of a http pack request as wellsb/leaksStefan Beller2015-03-241-0/+1
| * | | | | | | | | | | | | | | | | | | | read-cache: fix memleakStefan Beller2015-03-231-5/+2
| * | | | | | | | | | | | | | | | | | | | add_to_index(): free unused cache-entryJunio C Hamano2015-03-231-3/+5
| * | | | | | | | | | | | | | | | | | | | commit.c: fix a memory leakStefan Beller2015-03-231-2/+4
| * | | | | | | | | | | | | | | | | | | | http-push: remove unneeded cleanupStefan Beller2015-03-231-1/+0
| * | | | | | | | | | | | | | | | | | | | merge-recursive: fix memleaksStefan Beller2015-03-231-0/+3
| * | | | | | | | | | | | | | | | | | | | merge-blobs.c: fix a memleakStefan Beller2015-03-231-1/+3
| * | | | | | | | | | | | | | | | | | | | builtin/apply.c: fix a memleakStefan Beller2015-03-231-1/+3
| * | | | | | | | | | | | | | | | | | | | update-index: fix a memleakStefan Beller2015-03-221-0/+1