Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sg/subtree-signed-commits' | Junio C Hamano | 2018-03-08 | 1 | -6/+6 |
|\ | |||||
| * | subtree: fix add and pull for GPG-signed commitssg/subtree-signed-commits | Stephen R Guglielmo | 2018-02-23 | 1 | -6/+6 |
* | | Merge branch 'bw/perl-timegm-timelocal-fix' | Junio C Hamano | 2018-03-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | perl: call timegm and timelocal with 4-digit yearbw/perl-timegm-timelocal-fix | Bernhard M. Wiedemann | 2018-02-23 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'bw/c-plus-plus' | Junio C Hamano | 2018-03-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | object: rename function 'typename' to 'type_name' | Brandon Williams | 2018-02-14 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'nd/rebase-show-current-patch' | Junio C Hamano | 2018-03-06 | 1 | -4/+4 |
|\ \ | |||||
| * | | rebase: introduce and use pseudo-ref REBASE_HEADnd/rebase-show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+1 |
| * | | rebase: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -2/+2 |
| * | | am: add --show-current-patch | Nguyễn Thái Ngọc Duy | 2018-02-12 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'ab/fetch-prune' | Junio C Hamano | 2018-03-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | fetch: add a --prune-tags option and fetch.pruneTags config | Ævar Arnfjörð Bjarmason | 2018-02-09 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'nd/am-quit' | Junio C Hamano | 2018-02-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | am: support --quitnd/am-quit | Nguyễn Thái Ngọc Duy | 2018-02-14 | 1 | -1/+1 |
* | | | Merge branch 'rd/typofix' | Junio C Hamano | 2018-02-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofix | Robert P. J. Day | 2018-02-14 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'rs/cocci-strbuf-addf-to-addstr' | Junio C Hamano | 2018-02-15 | 1 | -16/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | cocci: simplify check for trivial format stringsrs/cocci-strbuf-addf-to-addstr | René Scharfe | 2018-02-02 | 1 | -16/+1 |
| |/ | |||||
* | | Merge branch 'nd/list-merge-strategy' | Junio C Hamano | 2018-02-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | completion: fix completing merge strategies on non-C localesnd/list-merge-strategy | Duy Nguyen | 2018-01-26 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'rs/strbuf-cocci-workaround' | Junio C Hamano | 2018-02-13 | 1 | -1/+2 |
|\ \ | |||||
| * | | cocci: use format keyword instead of a literal stringrs/strbuf-cocci-workaround | René Scharfe | 2018-01-19 | 1 | -1/+2 |
| * | | Merge branch 'tb/complete-describe' into maint | Junio C Hamano | 2017-10-18 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'rs/cocci-de-paren-call-params' into maint | Junio C Hamano | 2017-10-18 | 1 | -5/+5 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'ab/simplify-perl-makefile' | Junio C Hamano | 2018-02-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Makefile: replace perl/Makefile.PL with simple make rules | Ævar Arnfjörð Bjarmason | 2017-12-11 | 1 | -1/+1 |
* | | | | | Merge branch 'ra/prompt-eread-fix' | Junio C Hamano | 2017-12-28 | 1 | -3/+4 |
|\ \ \ \ \ | |||||
| * | | | | | git-prompt: fix reading files with windows line endingsra/prompt-eread-fix | Robert Abel | 2017-12-06 | 1 | -1/+1 |
| * | | | | | git-prompt: make __git_eread intended use explicit | Robert Abel | 2017-12-06 | 1 | -3/+4 |
| * | | | | | Merge branch 'tz/fsf-address-update' into maint | Junio C Hamano | 2017-11-21 | 7 | -16/+9 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/wincred-empty-cred' into maint | Junio C Hamano | 2017-11-15 | 1 | -2/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'dk/libsecret-unlock-to-load-fix' into maint | Junio C Hamano | 2017-11-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'ac/complete-pull-autostash' | Junio C Hamano | 2017-12-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | completion: add --autostash and --no-autostash to pullac/complete-pull-autostash | Albert Astals Cid | 2017-11-22 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'tz/complete-branch-copy' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: add '--copy' option to 'git branch'tz/complete-branch-copy | Todd Zullinger | 2017-11-17 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion' | Junio C Hamano | 2017-11-27 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | completion: add git config sendemail.tocmdrv/sendemail-tocmd-in-config-and-completion | Rasmus Villemoes | 2017-11-14 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 1 | -1/+1 |
| * | | | | | | | | | | Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maint | Junio C Hamano | 2017-07-10 | 1 | -7/+19 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | git-jump: give contact instructions in the README | Jeff King | 2017-11-21 | 1 | -0/+7 |
* | | | | | | | | | | | | contrib/git-jump: allow to configure the grep command | Beat Bolli | 2017-11-21 | 2 | -2/+8 |
* | | | | | | | | | | | | Merge branch 'tz/fsf-address-update' | Junio C Hamano | 2017-11-15 | 7 | -16/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Replace Free Software Foundation address in license notices | Todd Zullinger | 2017-11-09 | 7 | -16/+9 |
* | | | | | | | | | | | | Merge branch 'ab/mediawiki-namespace' | Junio C Hamano | 2017-11-15 | 1 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | remote-mediawiki: show progress while fetching namespacesab/mediawiki-namespace | Antoine Beaupré | 2017-11-08 | 1 | -0/+1 |
| * | | | | | | | | | | | | remote-mediawiki: process namespaces in order | Antoine Beaupré | 2017-11-08 | 1 | -1/+1 |
| * | | | | | | | | | | | | remote-mediawiki: support fetching from (Main) namespace | Antoine Beaupré | 2017-11-08 | 1 | -1/+6 |
| * | | | | | | | | | | | | remote-mediawiki: skip virtual namespaces | Antoine Beaupré | 2017-11-08 | 1 | -1/+4 |