Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: auto-size the block | Luke Diamand | 2018-06-12 | 2 | -6/+29 |
* | git-p4: narrow the scope of exceptions caught when parsing an int | Luke Diamand | 2018-06-12 | 1 | -1/+1 |
* | git-p4: raise exceptions from p4CmdList based on error from p4 server | Luke Diamand | 2018-06-12 | 1 | -4/+40 |
* | git-p4: better error reporting when p4 fails | Luke Diamand | 2018-06-12 | 2 | -0/+133 |
* | git-p4: add option to disable syncing of p4/master with p4 | Luke Diamand | 2018-06-12 | 2 | -11/+28 |
* | git-p4: disable-rebase: allow setting this via configuration | Luke Diamand | 2018-06-12 | 2 | -2/+5 |
* | git-p4: add options --commit and --disable-rebase | Romain Merland | 2018-06-12 | 3 | -6/+77 |
* | The fifth batch for 2.18 | Junio C Hamano | 2018-05-08 | 1 | -0/+112 |
* | Merge branch 'ma/http-walker-no-partial' | Junio C Hamano | 2018-05-08 | 6 | -40/+24 |
|\ | |||||
| * | walker: drop fields of `struct walker` which are always 1 | Martin Ågren | 2018-04-24 | 4 | -20/+8 |
| * | http-fetch: make `-a` standard behaviour | Martin Ågren | 2018-04-24 | 3 | -23/+19 |
* | | Merge branch 'js/runtime-prefix' | Junio C Hamano | 2018-05-08 | 4 | -9/+17 |
|\ \ | |||||
| * | | Avoid multiple PREFIX definitions | Philip Oakley | 2018-04-24 | 3 | -8/+8 |
| * | | git_setup_gettext: plug memory leak | Johannes Schindelin | 2018-04-24 | 1 | -2/+7 |
| * | | gettext: avoid initialization if the locale dir is not present | Johannes Schindelin | 2018-04-24 | 1 | -0/+3 |
* | | | Merge branch 'js/colored-push-errors' | Junio C Hamano | 2018-05-08 | 8 | -15/+211 |
|\ \ \ | |||||
| * | | | config: document the settings to colorize push errors/hints | Johannes Schindelin | 2018-04-24 | 1 | -0/+28 |
| * | | | push: test to verify that push errors are colored | Johannes Schindelin | 2018-04-24 | 1 | -0/+12 |
| * | | | push: colorize errors | Ryan Dammrose | 2018-04-24 | 4 | -5/+157 |
| * | | | color: introduce support for colorizing stderr | Johannes Schindelin | 2018-04-24 | 2 | -10/+14 |
* | | | | Merge branch 'jc/parseopt-expiry-errors' | Junio C Hamano | 2018-05-08 | 3 | -2/+20 |
|\ \ \ \ | |||||
| * | | | | parseopt: handle malformed --expire arguments more nicely | Junio C Hamano | 2018-04-23 | 3 | -1/+19 |
| * | | | | gc: do not upcase error message shown with die() | Junio C Hamano | 2018-04-23 | 1 | -1/+1 |
* | | | | | Merge branch 'ma/fast-export-skip-merge-fix' | Junio C Hamano | 2018-05-08 | 2 | -1/+22 |
|\ \ \ \ \ | |||||
| * | | | | | fast-export: fix regression skipping some merge-commits | Martin Ågren | 2018-04-21 | 2 | -1/+22 |
* | | | | | | Merge branch 'tz/doc-git-urls-reference' | Junio C Hamano | 2018-05-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | doc/clone: update caption for GIT URLS cross-reference | Todd Zullinger | 2018-04-20 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'tg/demote-stash-save-in-completion' | Junio C Hamano | 2018-05-08 | 1 | -2/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: make stash -p and alias for stash push -p | Thomas Gummerer | 2018-04-20 | 1 | -0/+3 |
| * | | | | | | completion: stop showing 'save' for stash by default | Thomas Gummerer | 2018-04-20 | 1 | -2/+7 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'sa/send-email-dedup-some-headers' | Junio C Hamano | 2018-05-08 | 1 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | send-email: avoid duplicate In-Reply-To/References | Stefan Agner | 2018-04-19 | 1 | -1/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/submodule-status-fix' | Junio C Hamano | 2018-05-08 | 1 | -2/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule--helper: don't print null in 'submodule status' | Nguyễn Thái Ngọc Duy | 2018-04-19 | 1 | -2/+6 |
* | | | | | | | Merge branch 'js/ident-date-fix' | Junio C Hamano | 2018-05-08 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sequencer: reset the committer date before commits | Johannes Sixt | 2018-04-19 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'bt/gpg-interface' | Junio C Hamano | 2018-05-08 | 3 | -34/+71 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gpg-interface: find the last gpg signature line | Jeff King | 2018-04-16 | 2 | -3/+20 |
| * | | | | | | | gpg-interface: extract gpg line matching helper | Jeff King | 2018-04-16 | 1 | -2/+7 |
| * | | | | | | | gpg-interface: fix const-correctness of "eol" pointer | Jeff King | 2018-04-16 | 1 | -2/+1 |
| * | | | | | | | gpg-interface: use size_t for signature buffer size | Jeff King | 2018-04-16 | 2 | -2/+2 |
| * | | | | | | | gpg-interface: modernize function declarations | Jeff King | 2018-04-16 | 2 | -28/+38 |
| * | | | | | | | gpg-interface: handle bool user.signingkey | Jeff King | 2018-04-16 | 1 | -0/+6 |
| * | | | | | | | t7004: fix mistaken tag name | Jeff King | 2018-04-16 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'hn/sort-ls-remote' | Junio C Hamano | 2018-05-08 | 3 | -11/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ls-remote: create '--sort' option | Harald Nordgren | 2018-04-09 | 3 | -11/+89 |
* | | | | | | | | Merge branch 'ab/git-svn-get-record-typofix' | Junio C Hamano | 2018-05-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-svn: avoid warning on undef readline() | Ævar Arnfjörð Bjarmason | 2018-04-09 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'tb/config-default' | Junio C Hamano | 2018-05-08 | 6 | -0/+127 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | builtin/config: introduce `color` type specifier | Taylor Blau | 2018-04-23 | 3 | -0/+58 |