summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t/test-lib: introduce --chain-lint optionJeff King2015-03-202-0/+26
* Post 2.3 cyce (batch #10)Junio C Hamano2015-03-173-300/+321
* Merge branch 'mg/doc-status-color-slot'Junio C Hamano2015-03-172-2/+5
|\
| * config,completion: add color.status.unmergedmg/doc-status-color-slotMichael J Gruber2015-03-102-2/+5
* | Merge branch 'mg/status-v-v'Junio C Hamano2015-03-173-67/+60
|\ \
| * | commit/status: show the index-worktree diff with -v -vMichael J Gruber2015-03-063-0/+35
| * | t7508: test git status -vMichael J Gruber2015-03-061-2/+12
| * | t7508: .gitignore 'expect' and 'output' filesJunio C Hamano2015-03-061-65/+13
| |/
* | Merge branch 'mg/sequencer-commit-messages-always-verbatim'Junio C Hamano2015-03-172-0/+33
|\ \
| * | sequencer: preserve commit messagesmg/sequencer-commit-messages-always-verbatimMichael J Gruber2015-03-062-0/+33
* | | Merge branch 'sg/completion-remote'Junio C Hamano2015-03-172-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 'es/rebase-i-count-todo'Junio C Hamano2015-03-172-1/+11
|\ \ \
| * | | rebase-interactive: re-word "item count" commentes/rebase-i-count-todoEric Sunshine2015-03-061-1/+1
| * | | rebase-interactive: suppress whitespace preceding item countEric Sunshine2015-03-062-0/+10
* | | | Merge branch 'ak/git-done-help-cleanup'Junio C Hamano2015-03-171-3/+2
|\ \ \ \
| * | | | git: make was_alias and done_help non-staticak/git-done-help-cleanupAlexander Kuleshov2015-03-061-3/+2
| | |/ / | |/| |
* | | | Merge branch 'rs/zip-text'Junio C Hamano2015-03-172-2/+70
|\ \ \ \
| * | | | archive-zip: mark text files in archivesrs/zip-textRené Scharfe2015-03-052-2/+70
| | |_|/ | |/| |
* | | | Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-1710-13/+2
|\ \ \ \
| * | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanupRené Scharfe2015-03-0510-13/+2
| |/ / /
* | | | Sync with 2.3.3Junio C Hamano2015-03-133-2/+42
|\ \ \ \
| * | | | Git 2.3.3v2.3.3Junio C Hamano2015-03-134-3/+43
| * | | | Merge branch 'mr/doc-clean-f-f' into maintJunio C Hamano2015-03-131-2/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'ak/t5516-typofix' into maintJunio C Hamano2015-03-131-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/diff-test-updates' into maintJunio C Hamano2015-03-1311-175/+550
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/diffcore-rename-duplicate' into maintJunio C Hamano2015-03-132-13/+110
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bw/kwset-use-unsigned' into maintJunio C Hamano2015-03-134-7/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-131-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mg/doc-remote-tags-or-not' into maintJunio C Hamano2015-03-131-0/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-132-1/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-133-37/+64
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-134-2/+399
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/daemon-interpolate' into maintJunio C Hamano2015-03-131-15/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-interpolate' into maintJunio C Hamano2015-03-133-6/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #9)stockJunio C Hamano2015-03-101-0/+7
* | | | | | | | | | | | | | | | | Merge branch 'mh/expire-updateref-fixes'Junio C Hamano2015-03-103-92/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | reflog_expire(): never update a reference to null_sha1mh/expire-updateref-fixesMichael Haggerty2015-03-051-2/+5
| * | | | | | | | | | | | | | | | | reflog_expire(): ignore --updateref for symbolic referencesMichael Haggerty2015-03-052-4/+14
| * | | | | | | | | | | | | | | | | reflog: improve and update documentationMichael Haggerty2015-03-052-64/+88
| * | | | | | | | | | | | | | | | | struct ref_lock: delete the force_write memberStefan Beller2015-03-051-5/+9
| * | | | | | | | | | | | | | | | | lock_ref_sha1_basic(): do not set force_write for missing referencesMichael Haggerty2015-03-051-9/+6
| * | | | | | | | | | | | | | | | | write_ref_sha1(): move write elision test to callersMichael Haggerty2015-03-051-9/+9
| * | | | | | | | | | | | | | | | | write_ref_sha1(): remove check for lock == NULLMichael Haggerty2015-03-051-4/+0
| * | | | | | | | | | | | | | | | | Merge branch 'sb/atomic-push' into mh/ref-trans-value-checkJunio C Hamano2015-02-0913-50/+429
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reflog-expire' into mh/ref-trans-value-checkJunio C Hamano2015-02-093-265/+332
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/diffcore-rename-duplicate'Junio C Hamano2015-03-102-13/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | diffcore-rename: avoid processing duplicate destinationsjk/diffcore-rename-duplicateJeff King2015-02-272-2/+85
| * | | | | | | | | | | | | | | | | | diffcore-rename: split locate_rename_dst into two functionsJeff King2015-02-271-12/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
View Lorry Controller Status