aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'rs/deflate-init-cleanup'Junio C Hamano2015-03-17
|\
| * zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe2015-03-05
* | Sync with 2.3.3Junio C Hamano2015-03-13
|\ \
| * | Git 2.3.3v2.3.3Junio C Hamano2015-03-13
| * | Merge branch 'mr/doc-clean-f-f' into maintJunio C Hamano2015-03-13
| |\ \
| * \ \ Merge branch 'ak/t5516-typofix' into maintJunio C Hamano2015-03-13
| |\ \ \
| * \ \ \ Merge branch 'jc/diff-test-updates' into maintJunio C Hamano2015-03-13
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/diffcore-rename-duplicate' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'bw/kwset-use-unsigned' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/grep-exclude-standard-help-fix' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mg/doc-remote-tags-or-not' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ms/submodule-update-config-doc' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/daemon-interpolate' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-interpolate' into maintJunio C Hamano2015-03-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Post 2.3 cycle (batch #9)Junio C Hamano2015-03-10
* | | | | | | | | | | | | | | Merge branch 'mh/expire-updateref-fixes'Junio C Hamano2015-03-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reflog_expire(): never update a reference to null_sha1Michael Haggerty2015-03-05
| * | | | | | | | | | | | | | | reflog_expire(): ignore --updateref for symbolic referencesMichael Haggerty2015-03-05
| * | | | | | | | | | | | | | | reflog: improve and update documentationMichael Haggerty2015-03-05
| * | | | | | | | | | | | | | | struct ref_lock: delete the force_write memberStefan Beller2015-03-05
| * | | | | | | | | | | | | | | lock_ref_sha1_basic(): do not set force_write for missing referencesMichael Haggerty2015-03-05
| * | | | | | | | | | | | | | | write_ref_sha1(): move write elision test to callersMichael Haggerty2015-03-05
| * | | | | | | | | | | | | | | write_ref_sha1(): remove check for lock == NULLMichael Haggerty2015-03-05
| * | | | | | | | | | | | | | | Merge branch 'sb/atomic-push' into mh/ref-trans-value-checkJunio C Hamano2015-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/reflog-expire' into mh/ref-trans-value-checkJunio C Hamano2015-02-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diffcore-rename-duplicate'Junio C Hamano2015-03-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | diffcore-rename: avoid processing duplicate destinationsJeff King2015-02-27
| * | | | | | | | | | | | | | | | | diffcore-rename: split locate_rename_dst into two functionsJeff King2015-02-27
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #8)Junio C Hamano2015-03-06
* | | | | | | | | | | | | | | | | Merge branch 'bw/kwset-use-unsigned'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | kwset: use unsigned char to store values with high-bit setBen Walton2015-03-02
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'ak/t5516-typofix'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | t5516: correct misspelled pushInsteadOfAnders Kaseorg2015-03-03
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ms/submodule-update-config-doc'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | submodule: improve documentation of update subcommandMichal Sojka2015-03-02
* | | | | | | | | | | | | | | Merge branch 'ja/clean-confirm-i18n'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add hint interactive cleaningJean-Noel Avila2015-03-02
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | diff --shortstat --dirstat: remove duplicate outputMårten Kongstad2015-03-02
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'mg/doc-remote-tags-or-not'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | git-remote.txt: describe behavior without --tags and --no-tagsMichael J Gruber2015-03-02
* | | | | | | | | | | | | | Merge branch 'nd/grep-exclude-standard-help-fix'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | grep: correct help string for --exclude-standardNguyễn Thái Ngọc Duy2015-02-27
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mr/doc-clean-f-f'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Documentation/git-clean.txt: document that -f may need to be given twiceMikko Rapeli2015-02-26
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ye/http-accept-language'Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gettext.c: move get_preferred_languages() from http.cJeff King2015-02-26
* | | | | | | | | | | | | Sync with 2.3.2Junio C Hamano2015-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |