Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | completion: simplify __git_remotes()sg/completion-remote | SZEDER Gábor | 2015-03-06 | 1 | -5/+2 | |
| * | | | completion: add a test for __git_remotes() helper function | SZEDER Gábor | 2015-03-06 | 1 | -0/+19 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'es/rebase-i-count-todo' | Junio C Hamano | 2015-03-17 | 2 | -1/+11 | |
|\ \ \ | ||||||
| * | | | rebase-interactive: re-word "item count" commentes/rebase-i-count-todo | Eric Sunshine | 2015-03-06 | 1 | -1/+1 | |
| * | | | rebase-interactive: suppress whitespace preceding item count | Eric Sunshine | 2015-03-06 | 2 | -0/+10 | |
* | | | | Merge branch 'ak/git-done-help-cleanup' | Junio C Hamano | 2015-03-17 | 1 | -3/+2 | |
|\ \ \ \ | ||||||
| * | | | | git: make was_alias and done_help non-staticak/git-done-help-cleanup | Alexander Kuleshov | 2015-03-06 | 1 | -3/+2 | |
| | |/ / | |/| | | ||||||
* | | | | Merge branch 'rs/zip-text' | Junio C Hamano | 2015-03-17 | 2 | -2/+70 | |
|\ \ \ \ | ||||||
| * | | | | archive-zip: mark text files in archivesrs/zip-text | René Scharfe | 2015-03-05 | 2 | -2/+70 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'rs/deflate-init-cleanup' | Junio C Hamano | 2015-03-17 | 10 | -13/+2 | |
|\ \ \ \ | ||||||
| * | | | | zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}rs/deflate-init-cleanup | René Scharfe | 2015-03-05 | 10 | -13/+2 | |
| |/ / / | ||||||
* | | | | Sync with 2.3.3 | Junio C Hamano | 2015-03-13 | 3 | -2/+42 | |
|\ \ \ \ | ||||||
| * | | | | Git 2.3.3v2.3.3 | Junio C Hamano | 2015-03-13 | 4 | -3/+43 | |
| * | | | | Merge branch 'mr/doc-clean-f-f' into maint | Junio C Hamano | 2015-03-13 | 1 | -2/+6 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'ak/t5516-typofix' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'jc/diff-test-updates' into maint | Junio C Hamano | 2015-03-13 | 11 | -175/+550 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'jk/diffcore-rename-duplicate' into maint | Junio C Hamano | 2015-03-13 | 2 | -13/+110 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'bw/kwset-use-unsigned' into maint | Junio C Hamano | 2015-03-13 | 4 | -7/+7 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'nd/grep-exclude-standard-help-fix' into maint | Junio C Hamano | 2015-03-13 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'mg/doc-remote-tags-or-not' into maint | Junio C Hamano | 2015-03-13 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/diff-shortstat-dirstat-fix' into maint | Junio C Hamano | 2015-03-13 | 2 | -1/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ms/submodule-update-config-doc' into maint | Junio C Hamano | 2015-03-13 | 3 | -37/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-beyond-symlink' into maint | Junio C Hamano | 2015-03-13 | 4 | -2/+399 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/daemon-interpolate' into maint | Junio C Hamano | 2015-03-13 | 1 | -15/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/daemon-interpolate' into maint | Junio C Hamano | 2015-03-13 | 3 | -6/+83 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #9)stock | Junio C Hamano | 2015-03-10 | 1 | -0/+7 | |
* | | | | | | | | | | | | | | | | | Merge branch 'mh/expire-updateref-fixes' | Junio C Hamano | 2015-03-10 | 3 | -92/+126 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | reflog_expire(): never update a reference to null_sha1mh/expire-updateref-fixes | Michael Haggerty | 2015-03-05 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | | | | reflog_expire(): ignore --updateref for symbolic references | Michael Haggerty | 2015-03-05 | 2 | -4/+14 | |
| * | | | | | | | | | | | | | | | | | reflog: improve and update documentation | Michael Haggerty | 2015-03-05 | 2 | -64/+88 | |
| * | | | | | | | | | | | | | | | | | struct ref_lock: delete the force_write member | Stefan Beller | 2015-03-05 | 1 | -5/+9 | |
| * | | | | | | | | | | | | | | | | | lock_ref_sha1_basic(): do not set force_write for missing references | Michael Haggerty | 2015-03-05 | 1 | -9/+6 | |
| * | | | | | | | | | | | | | | | | | write_ref_sha1(): move write elision test to callers | Michael Haggerty | 2015-03-05 | 1 | -9/+9 | |
| * | | | | | | | | | | | | | | | | | write_ref_sha1(): remove check for lock == NULL | Michael Haggerty | 2015-03-05 | 1 | -4/+0 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'sb/atomic-push' into mh/ref-trans-value-check | Junio C Hamano | 2015-02-09 | 13 | -50/+429 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check | Junio C Hamano | 2015-02-09 | 3 | -265/+332 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/diffcore-rename-duplicate' | Junio C Hamano | 2015-03-10 | 2 | -13/+110 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | diffcore-rename: avoid processing duplicate destinationsjk/diffcore-rename-duplicate | Jeff King | 2015-02-27 | 2 | -2/+85 | |
| * | | | | | | | | | | | | | | | | | | diffcore-rename: split locate_rename_dst into two functions | Jeff King | 2015-02-27 | 1 | -12/+26 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Post 2.3 cycle (batch #8) | Junio C Hamano | 2015-03-06 | 1 | -1/+25 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'bw/kwset-use-unsigned' | Junio C Hamano | 2015-03-06 | 4 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | kwset: use unsigned char to store values with high-bit setbw/kwset-use-unsigned | Ben Walton | 2015-03-02 | 4 | -7/+7 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'ak/t5516-typofix' | Junio C Hamano | 2015-03-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | t5516: correct misspelled pushInsteadOfak/t5516-typofix | Anders Kaseorg | 2015-03-03 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ms/submodule-update-config-doc' | Junio C Hamano | 2015-03-06 | 3 | -37/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | submodule: improve documentation of update subcommandms/submodule-update-config-doc | Michal Sojka | 2015-03-02 | 3 | -37/+64 | |
* | | | | | | | | | | | | | | | | Merge branch 'ja/clean-confirm-i18n' | Junio C Hamano | 2015-03-06 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Add hint interactive cleaningja/clean-confirm-i18n | Jean-Noel Avila | 2015-03-02 | 1 | -1/+2 | |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'mk/diff-shortstat-dirstat-fix' | Junio C Hamano | 2015-03-06 | 2 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | diff --shortstat --dirstat: remove duplicate outputmk/diff-shortstat-dirstat-fix | Mårten Kongstad | 2015-03-02 | 2 | -1/+15 | |
| |/ / / / / / / / / / / / / / |