Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | | | | remote-mediawiki: show known namespace choices on failure | Antoine Beaupré | 2017-11-08 | 1 | -1/+2 |
| * | | | | | | | | | remote-mediawiki: allow fetching namespaces with spaces | Ingo Ruhnke | 2017-11-07 | 1 | -0/+1 |
| * | | | | | | | | | remote-mediawiki: add namespace support | Kevin | 2017-11-07 | 1 | -0/+25 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'ab/mediawiki-name-truncation' | Junio C Hamano | 2017-11-15 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | remote-mediawiki: limit filenames to legalab/mediawiki-name-truncation | Antoine Beaupré | 2017-11-01 | 1 | -1/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'js/wincred-empty-cred' | Junio C Hamano | 2017-11-09 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | wincred: handle empty username/password correctlyjs/wincred-empty-cred | Jakub Bereżański | 2017-11-01 | 1 | -2/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'dk/libsecret-unlock-to-load-fix' | Junio C Hamano | 2017-11-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | credential-libsecret: unlock locked secretsdk/libsecret-unlock-to-load-fix | Dennis Kaarsemaker | 2017-11-04 | 1 | -1/+1 |
* | | | | | | | Merge branch 'tb/complete-checkout' | Junio C Hamano | 2017-11-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | completion: add remaining flags to checkouttb/complete-checkout | Thomas Braun | 2017-10-25 | 1 | -1/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'dm/run-command-ignored-hook-advise' | Junio C Hamano | 2017-11-06 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | run-command: add hint when a hook is ignoreddm/run-command-ignored-hook-advise | Damien Marié | 2017-10-10 | 1 | -0/+1 |
* | | | | | | Merge branch 'tb/complete-describe' | Junio C Hamano | 2017-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | completion: add --broken and --dirty to describetb/complete-describe | Thomas Braun | 2017-10-07 | 1 | -1/+1 |
* | | | | | | Merge branch 'rs/cocci-de-paren-call-params' | Junio C Hamano | 2017-10-05 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | coccinelle: remove parentheses that become unnecessaryrs/cocci-de-paren-call-params | René Scharfe | 2017-10-02 | 1 | -5/+5 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dw/diff-highlight-makefile-fix' | Junio C Hamano | 2017-09-19 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff-highlight: add clean target to Makefiledw/diff-highlight-makefile-fix | Daniel Watkins | 2017-09-06 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'ma/up-to-date' | Junio C Hamano | 2017-09-10 | 3 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 3 | -4/+4 |
* | | | | | | | Merge branch 'eb/contacts-reported-by' | Junio C Hamano | 2017-08-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-contacts: also recognise "Reported-by:"eb/contacts-reported-by | Eric Blake | 2017-07-27 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'rg/rerere-train-overwrite' | Junio C Hamano | 2017-08-11 | 1 | -2/+52 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | contrib/rerere-train: optionally overwrite existing resolutionsrg/rerere-train-overwrite | Raman Gupta | 2017-07-26 | 1 | -2/+52 |
| |/ / / / / | |||||
* | | | | | | add MOVE_ARRAY | René Scharfe | 2017-07-17 | 1 | -0/+17 |
|/ / / / / |