summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-p4: auto-size the blockLuke Diamand2018-06-122-6/+29
* git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand2018-06-121-1/+1
* git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand2018-06-121-4/+40
* git-p4: better error reporting when p4 failsLuke Diamand2018-06-122-0/+133
* git-p4: add option to disable syncing of p4/master with p4Luke Diamand2018-06-122-11/+28
* git-p4: disable-rebase: allow setting this via configurationLuke Diamand2018-06-122-2/+5
* git-p4: add options --commit and --disable-rebaseRomain Merland2018-06-123-6/+77
* The fifth batch for 2.18Junio C Hamano2018-05-081-0/+112
* Merge branch 'ma/http-walker-no-partial'Junio C Hamano2018-05-086-40/+24
|\
| * walker: drop fields of `struct walker` which are always 1Martin Ågren2018-04-244-20/+8
| * http-fetch: make `-a` standard behaviourMartin Ågren2018-04-243-23/+19
* | Merge branch 'js/runtime-prefix'Junio C Hamano2018-05-084-9/+17
|\ \
| * | Avoid multiple PREFIX definitionsPhilip Oakley2018-04-243-8/+8
| * | git_setup_gettext: plug memory leakJohannes Schindelin2018-04-241-2/+7
| * | gettext: avoid initialization if the locale dir is not presentJohannes Schindelin2018-04-241-0/+3
* | | Merge branch 'js/colored-push-errors'Junio C Hamano2018-05-088-15/+211
|\ \ \
| * | | config: document the settings to colorize push errors/hintsJohannes Schindelin2018-04-241-0/+28
| * | | push: test to verify that push errors are coloredJohannes Schindelin2018-04-241-0/+12
| * | | push: colorize errorsRyan Dammrose2018-04-244-5/+157
| * | | color: introduce support for colorizing stderrJohannes Schindelin2018-04-242-10/+14
* | | | Merge branch 'jc/parseopt-expiry-errors'Junio C Hamano2018-05-083-2/+20
|\ \ \ \
| * | | | parseopt: handle malformed --expire arguments more nicelyJunio C Hamano2018-04-233-1/+19
| * | | | gc: do not upcase error message shown with die()Junio C Hamano2018-04-231-1/+1
* | | | | Merge branch 'ma/fast-export-skip-merge-fix'Junio C Hamano2018-05-082-1/+22
|\ \ \ \ \
| * | | | | fast-export: fix regression skipping some merge-commitsMartin Ågren2018-04-212-1/+22
* | | | | | Merge branch 'tz/doc-git-urls-reference'Junio C Hamano2018-05-081-1/+1
|\ \ \ \ \ \
| * | | | | | doc/clone: update caption for GIT URLS cross-referenceTodd Zullinger2018-04-201-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'tg/demote-stash-save-in-completion'Junio C Hamano2018-05-081-2/+10
|\ \ \ \ \ \
| * | | | | | completion: make stash -p and alias for stash push -pThomas Gummerer2018-04-201-0/+3
| * | | | | | completion: stop showing 'save' for stash by defaultThomas Gummerer2018-04-201-2/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sa/send-email-dedup-some-headers'Junio C Hamano2018-05-081-1/+6
|\ \ \ \ \ \
| * | | | | | send-email: avoid duplicate In-Reply-To/ReferencesStefan Agner2018-04-191-1/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/submodule-status-fix'Junio C Hamano2018-05-081-2/+6
|\ \ \ \ \ \
| * | | | | | submodule--helper: don't print null in 'submodule status'Nguyễn Thái Ngọc Duy2018-04-191-2/+6
* | | | | | | Merge branch 'js/ident-date-fix'Junio C Hamano2018-05-081-0/+2
|\ \ \ \ \ \ \
| * | | | | | | sequencer: reset the committer date before commitsJohannes Sixt2018-04-191-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'bt/gpg-interface'Junio C Hamano2018-05-083-34/+71
|\ \ \ \ \ \ \
| * | | | | | | gpg-interface: find the last gpg signature lineJeff King2018-04-162-3/+20
| * | | | | | | gpg-interface: extract gpg line matching helperJeff King2018-04-161-2/+7
| * | | | | | | gpg-interface: fix const-correctness of "eol" pointerJeff King2018-04-161-2/+1
| * | | | | | | gpg-interface: use size_t for signature buffer sizeJeff King2018-04-162-2/+2
| * | | | | | | gpg-interface: modernize function declarationsJeff King2018-04-162-28/+38
| * | | | | | | gpg-interface: handle bool user.signingkeyJeff King2018-04-161-0/+6
| * | | | | | | t7004: fix mistaken tag nameJeff King2018-04-161-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'hn/sort-ls-remote'Junio C Hamano2018-05-083-11/+89
|\ \ \ \ \ \ \
| * | | | | | | ls-remote: create '--sort' optionHarald Nordgren2018-04-093-11/+89
* | | | | | | | Merge branch 'ab/git-svn-get-record-typofix'Junio C Hamano2018-05-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git-svn: avoid warning on undef readline()Ævar Arnfjörð Bjarmason2018-04-091-1/+1
* | | | | | | | | Merge branch 'tb/config-default'Junio C Hamano2018-05-086-0/+127
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/config: introduce `color` type specifierTaylor Blau2018-04-233-0/+58