Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failure | GIRARD Etienne | 2015-11-24 | 2 | -35/+38 |
* | Merge branch 'js/gc-with-stale-symref' into maint | Junio C Hamano | 2015-10-20 | 2 | -1/+20 |
|\ | |||||
| * | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symref | Johannes Schindelin | 2015-10-08 | 2 | -2/+8 |
| * | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 | 1 | -0/+13 |
* | | Merge branch 'rd/test-path-utils' into maint | Junio C Hamano | 2015-10-20 | 2 | -2/+5 |
|\ \ | |||||
| * | | test-path-utils.c: remove incorrect assumptionrd/test-path-utils | Ray Donnelly | 2015-10-08 | 2 | -2/+5 |
* | | | Merge branch 'jc/doc-gc-prune-now' into maint | Junio C Hamano | 2015-10-20 | 1 | -2/+5 |
|\ \ \ | |||||
| * | | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-now | Junio C Hamano | 2015-10-14 | 1 | -2/+5 |
* | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-10-20 | 2 | -1/+15 |
|\ \ \ \ | |||||
| * | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-line | James McCoy | 2015-10-12 | 2 | -1/+15 |
* | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2015-10-18 | 1 | -1583/+1967 |
|\ \ \ \ \ | |||||
| * | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2015-09-30 | 1 | -1583/+1967 |
* | | | | | | Git 2.6.2v2.6.2 | Junio C Hamano | 2015-10-16 | 4 | -3/+69 |
* | | | | | | Merge branch 'cc/quote-comments' into maint | Junio C Hamano | 2015-10-16 | 1 | -5/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | quote: move comment before sq_quote_buf()cc/quote-comments | Christian Couder | 2015-10-07 | 1 | -5/+5 |
| * | | | | | | quote: fix broken sq_quote_buf() related comment | Christian Couder | 2015-10-07 | 1 | -0/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'es/worktree-add-cleanup' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t2026: rename worktree prune testes/worktree-add-cleanup | Michael J Gruber | 2015-10-07 | 1 | -0/+0 |
* | | | | | | | Merge branch 'tk/doc-interpret-trailers-grammo' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Documentation/interpret-trailers: Grammar fixtk/doc-interpret-trailers-grammo | Tobias Klauser | 2015-10-07 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'tk/typofix-connect-unknown-proto-error' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | connect: fix typo in result string of prot_name()tk/typofix-connect-unknown-proto-error | Tobias Klauser | 2015-09-25 | 1 | -1/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint | Junio C Hamano | 2015-10-16 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: fix section header mark-upjk/asciidoctor-section-heading-markup-fix | John Keeping | 2015-09-25 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'nd/ls-remote-does-not-have-u-option' into maint | Junio C Hamano | 2015-10-16 | 2 | -3/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ls-remote.txt: delete unsupported optionnd/ls-remote-does-not-have-u-option | Nguyễn Thái Ngọc Duy | 2015-09-28 | 2 | -3/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 | 2 | -5/+35 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fsck: exit with non-zero when problems are foundjc/fsck-dropped-errors | Junio C Hamano | 2015-09-23 | 2 | -5/+35 |
* | | | | | | | | | | Merge branch 'sb/http-flaky-test-fix' into maint | Junio C Hamano | 2015-10-16 | 3 | -23/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5561: get rid of racy appending to logfilesb/http-flaky-test-fix | Stephan Beyer | 2015-09-25 | 3 | -23/+1 |
* | | | | | | | | | | | Merge branch 'sb/perf-without-installed-git' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t/perf: make runner work even if Git is not installedsb/perf-without-installed-git | Stephan Beyer | 2015-09-25 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'js/icase-wt-detection' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | setup: fix "inside work tree" detection on case-insensitive filesystemsjs/icase-wt-detection | Johannes Schindelin | 2015-09-28 | 1 | -1/+10 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'pt/am-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | am: configure gpg at startuppt/am-builtin | Renee Margaret McConahy | 2015-09-30 | 1 | -1/+12 |
* | | | | | | | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' into maint | Junio C Hamano | 2015-10-16 | 2 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | status: don't say 'HEAD detached at HEAD'mm/detach-at-HEAD-reflog | Matthieu Moy | 2015-10-02 | 2 | -1/+7 |
| * | | | | | | | | | | | | | t3203: test 'detached at' after checkout --detach | Matthieu Moy | 2015-10-02 | 1 | -0/+13 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-10-16 | 2 | -35/+46 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | rebase-i: loosen over-eager check_bad_cmd check | Matthieu Moy | 2015-10-05 | 2 | -33/+44 |
| * | | | | | | | | | | | | | rebase-i: explicitly accept tab as separator in commands | Matthieu Moy | 2015-10-02 | 1 | -2/+2 |
* | | | | | | | | | | | | | | Merge branch 'dt/log-follow-config' into maint | Junio C Hamano | 2015-10-16 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | log: Update log.follow doc and add to config.txtdt/log-follow-config | Eric N. Vander Weele | 2015-10-07 | 2 | -4/+10 |
* | | | | | | | | | | | | | | | Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint | Junio C Hamano | 2015-10-16 | 3 | -14/+34 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | pager: don't use unsafe functions in signal handlersti/glibc-stdio-mutex-from-signal-handler | Takashi Iwai | 2015-09-04 | 3 | -14/+34 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc' into maint | Junio C Hamano | 2015-10-16 | 3 | -3/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | notes: correct documentation of DWIMery for notes referencesjk/notes-dwim-doc | Jacob Keller | 2015-09-22 | 3 | -3/+12 |
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'jk/make-findstring-makeflags-fix' into maint | Junio C Hamano | 2015-10-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Makefile: fix MAKEFLAGS tests with multiple flagsjk/make-findstring-makeflags-fix | John Keeping | 2015-09-10 | 1 | -2/+2 |