aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2018-01-07
|\
| * Merge branch '2.16' of https://github.com/ChrisADR/git-poJiang Xin2018-01-06
| |\
| | * l10n: es.po: Update Spanish Translation v2.16.0Christopher Díaz Riveros2018-01-04
| * | Merge branch 'fr_2.16' of git://github.com/jnavila/gitJiang Xin2018-01-06
| |\ \ | | |/ | |/|
| | * l10n: fr.po v2.16.0 round 1Jean-Noel Avila2018-01-02
| | * l10n: fr.po: "worktree list" mistranslated as pruneLouis Bettens2017-12-31
| * | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2018-01-02
| |\ \
| | * | l10n: bg.po: Updated Bulgarian translation (3284t)Alexander Shopov2018-01-01
| | |/
| * | l10n: sv.po: Update Swedish translation (3284t0f0u)Peter Krefting2018-01-01
| |/
| * Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2017-12-31
| |\
| | * l10n: fixes to German translationRobert Abel2017-12-06
| | * Merge branch '2.15.1' of https://github.com/ChrisADR/git-po into maintJiang Xin2017-12-05
| | |\
| | | * l10n: Update Spanish translationChristopher Díaz Riveros2017-12-04
| | * | l10n: zh_CN translate parameter nameFangyi Zhou2017-12-03
| | * | l10n: zh_CN Fix typoZhou Fangyi2017-12-03
| | * | l10n: Fixes to Catalan translationJordi Mas2017-11-04
| | |/
| * | l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)Jiang Xin2017-12-31
* | | Git 2.16-rc1Junio C Hamano2018-01-05
* | | Merge branch 'js/sequencer-cleanups'Junio C Hamano2018-01-05
|\ \ \
| * | | sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin2017-12-27
| * | | sequencer: report when noop has an argumentJohannes Schindelin2017-12-27
| * | | sequencer: remove superfluous conditionalJohannes Schindelin2017-12-27
| * | | sequencer: strip bogus LF at end of error messagesJohannes Schindelin2017-12-27
| * | | rebase: do not continue when the todo list generation failedJohannes Schindelin2017-12-27
* | | | Merge branch 'jh/memihash-opt'Junio C Hamano2018-01-05
|\ \ \ \
| * | | | t/helper/test-lazy-name-hash: fix compilationStefan Beller2017-12-22
* | | | | Merge branch 'tb/test-lint-wc-l'Junio C Hamano2018-01-05
|\ \ \ \ \
| * | | | | check-non-portable-shell.pl: `wc -l` may have leading WSTorsten Bögershausen2017-12-22
* | | | | | Merge branch 'rs/use-argv-array-in-child-process'Junio C Hamano2018-01-05
|\ \ \ \ \ \
| * | | | | | send-pack: use internal argv_array of struct child_processRené Scharfe2017-12-22
| * | | | | | http: use internal argv_array of struct child_processRené Scharfe2017-12-22
| |/ / / / /
* | | | | | Merge branch 'ld/p4-multiple-shelves'Junio C Hamano2018-01-05
|\ \ \ \ \ \
| * | | | | | git-p4: update multiple shelved change listsLuke Diamand2017-12-22
| |/ / / / /
* | | | | | Merge branch 'jd/fix-strbuf-add-urlencode-bytes'Junio C Hamano2018-01-05
|\ \ \ \ \ \
| * | | | | | strbuf: fix urlencode format string on signed charJulien Dusser2017-12-22
* | | | | | | Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2018-01-05
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2017-12-22
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2017-12-22
| | * | | | | | move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren2017-12-22
| | * | | | | | t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren2017-12-22
| | |/ / / / /
* | | | | | | Merge branch 'db/doc-config-section-names-with-bs'Junio C Hamano2018-01-05
|\ \ \ \ \ \ \
| * | | | | | | config.txt: document behavior of backslashes in subsectionsDave Borowitz2017-12-22
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/test-suite-tracing'Junio C Hamano2018-01-05
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | t/Makefile: introduce TEST_SHELL_PATHJeff King2017-12-08
| * | | | | | test-lib: make "-x" work with "--verbose-log"Jeff King2017-12-08
| * | | | | | t5615: avoid re-using descriptor 4Jeff King2017-12-08
| * | | | | | test-lib: silence "-x" cleanup under bashJeff King2017-12-08
| |/ / / / /
* | | | | | Git 2.16-rc0Junio C Hamano2017-12-28
* | | | | | Merge branch 'sb/describe-blob'Junio C Hamano2017-12-28
|\ \ \ \ \ \
| * | | | | | builtin/describe.c: describe a blobStefan Beller2017-12-19