Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bash-completion: add support for git-log --merges= and log.mergeskk/log-merges-config | Koosha Khajehmoogahi | 2015-04-21 | 1 | -1/+10 |
* | t4202-log: add tests for --merges= | Koosha Khajehmoogahi | 2015-04-04 | 1 | -0/+84 |
* | Documentation: add git-log --merges= option and log.merges config. var | Koosha Khajehmoogahi | 2015-04-04 | 2 | -3/+18 |
* | log: honor log.merges= option | Junio C Hamano | 2015-04-04 | 1 | -0/+6 |
* | revision: add --merges={show|only|hide} option | Junio C Hamano | 2015-04-04 | 2 | -0/+21 |
* | Git 2.4.0-rc1v2.4.0-rc1 | Junio C Hamano | 2015-04-02 | 2 | -3/+4 |
* | Merge branch 'sb/atomic-push' | Junio C Hamano | 2015-04-02 | 1 | -1/+1 |
|\ | |||||
| * | send-pack: unify error messages for unsupported capabilitiessb/atomic-push | Ralf Thielow | 2015-04-02 | 1 | -1/+1 |
* | | Sync with 2.3.5 | Junio C Hamano | 2015-03-31 | 3 | -2/+8 |
|\ \ | |||||
| * | | Git 2.3.5v2.3.5 | Junio C Hamano | 2015-03-31 | 3 | -2/+6 |
| * | | Merge branch 'ss/pull-rebase-preserve' into maint | Junio C Hamano | 2015-03-31 | 2 | -4/+5 |
| |\ \ | |||||
| | * | | docs: clarify what git-rebase's "-p" / "--preserve-merges" doesss/pull-rebase-preserve | Sebastian Schuberth | 2015-03-30 | 1 | -1/+3 |
| * | | | Merge branch 'jc/report-path-error-to-dir' into maint | Junio C Hamano | 2015-03-31 | 4 | -44/+44 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ph/push-doc-cas' into maint | Junio C Hamano | 2015-03-31 | 1 | -8/+6 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Sync with maint | Junio C Hamano | 2015-03-28 | 2 | -1/+42 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Prepare for 2.3.5 | Junio C Hamano | 2015-03-28 | 2 | -1/+42 |
| * | | | | | Merge branch 'sg/completion-gitcomp-nl-for-refs' into maint | Junio C Hamano | 2015-03-28 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint | Junio C Hamano | 2015-03-28 | 1 | -7/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'tg/test-index-v4' into maint | Junio C Hamano | 2015-03-28 | 1 | -3/+12 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'nd/doc-git-index-version' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ct/prompt-untracked-fix' into maint | Junio C Hamano | 2015-03-28 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ws/grep-quiet-no-pager' into maint | Junio C Hamano | 2015-03-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/submitting-patches-mention-send-email' into maint | Junio C Hamano | 2015-03-28 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/cleanup-failed-clone' into maint | Junio C Hamano | 2015-03-28 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fetch-pack' into maint | Junio C Hamano | 2015-03-28 | 3 | -13/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/fix-check-order-with-split-index' into maint | Junio C Hamano | 2015-03-28 | 1 | -19/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/prune-with-corrupt-refs' into maint | Junio C Hamano | 2015-03-28 | 7 | -68/+147 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | 2.3.2 release notes: typofix | Thomas Ackermann | 2015-03-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | RelNotes: minor doc updates | Junio C Hamano | 2015-03-28 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | Merge branch 'ph/push-doc-cas' | Junio C Hamano | 2015-03-28 | 1 | -8/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | git-push.txt: clean up force-with-lease wordingph/push-doc-cas | Phil Hord | 2015-03-26 | 1 | -8/+6 |
* | | | | | | | | | | | | | | | | | Merge branch 'ss/pull-rebase-preserve' | Junio C Hamano | 2015-03-28 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | docs: clarify "preserve" option wording for git-pull | Sebastian Schuberth | 2015-03-26 | 1 | -3/+2 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jn/doc-api-errors' | Junio C Hamano | 2015-03-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | api-error-handling doc: typofixjn/doc-api-errors | Thomas Ackermann | 2015-03-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'jk/tag-h-column-is-a-listing-option' into maint | Junio C Hamano | 2015-03-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/smart-http-hide-refs' into maint | Junio C Hamano | 2015-03-27 | 2 | -6/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint | Junio C Hamano | 2015-03-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Update mailmap to spell out "Alexander Kuleshov" | Junio C Hamano | 2015-03-27 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/leaks' | Junio C Hamano | 2015-03-27 | 8 | -15/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | http: release the memory of a http pack request as wellsb/leaks | Stefan Beller | 2015-03-24 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | | | | read-cache: fix memleak | Stefan Beller | 2015-03-23 | 1 | -5/+2 |
| * | | | | | | | | | | | | | | | | | | | | add_to_index(): free unused cache-entry | Junio C Hamano | 2015-03-23 | 1 | -3/+5 |
| * | | | | | | | | | | | | | | | | | | | | commit.c: fix a memory leak | Stefan Beller | 2015-03-23 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | | | | | | | http-push: remove unneeded cleanup | Stefan Beller | 2015-03-23 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | | | | | | merge-recursive: fix memleaks | Stefan Beller | 2015-03-23 | 1 | -0/+3 |
| * | | | | | | | | | | | | | | | | | | | | merge-blobs.c: fix a memleak | Stefan Beller | 2015-03-23 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | builtin/apply.c: fix a memleak | Stefan Beller | 2015-03-23 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | | | update-index: fix a memleak | Stefan Beller | 2015-03-22 | 1 | -0/+1 |