Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am: fix signoff when other trailers are present | Phillip Wood | 2017-08-08 | 2 | -45/+64 |
* | Git 2.13.4v2.13.4 | Junio C Hamano | 2017-08-01 | 1 | -1/+1 |
* | Preparation for 2.13.4 continues | Junio C Hamano | 2017-07-31 | 1 | -0/+18 |
* | Merge branch 'ks/doc-fixes' into maint | Junio C Hamano | 2017-07-31 | 2 | -10/+11 |
|\ | |||||
| * | doc: reformat the paragraph containing the 'cut-line' | Kaartic Sivaraam | 2017-07-19 | 1 | -5/+6 |
| * | doc: camelCase the i18n config variables to improve readability | Kaartic Sivaraam | 2017-07-18 | 1 | -5/+5 |
* | | Merge branch 'jk/test-copy-bytes-fix' into maint | Junio C Hamano | 2017-07-31 | 1 | -0/+1 |
|\ \ | |||||
| * | | t: handle EOF in test_copy_bytes() | Jeff King | 2017-07-17 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'pw/unquote-path-in-git-pm' into maint | Junio C Hamano | 2017-07-31 | 3 | -43/+61 |
|\ \ | |||||
| * | | t9700: add tests for Git::unquote_path() | Phillip Wood | 2017-06-30 | 1 | -0/+7 |
| * | | Git::unquote_path(): throw an exception on bad path | Phillip Wood | 2017-06-30 | 1 | -2/+2 |
| * | | Git::unquote_path(): handle '\a' | Phillip Wood | 2017-06-30 | 1 | -1/+2 |
| * | | add -i: move unquote_path() to Git.pm | Phillip Wood | 2017-06-30 | 2 | -43/+53 |
* | | | Merge branch 'jk/gc-pre-detach-under-hook' into maint | Junio C Hamano | 2017-07-31 | 2 | -0/+25 |
|\ \ \ | |||||
| * | | | gc: run pre-detach operations under lock | Jeff King | 2017-07-12 | 2 | -0/+25 |
* | | | | Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint | Junio C Hamano | 2017-07-31 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | pre-rebase hook: capture documentation in a <<here document | Jonathan Nieder | 2017-07-11 | 1 | -3/+3 |
* | | | | | Merge branch 'rs/progress-overall-throughput-at-the-end' into maint | Junio C Hamano | 2017-07-31 | 1 | -2/+6 |
|\ \ \ \ \ | |||||
| * | | | | | progress: show overall rate in last update | René Scharfe | 2017-07-09 | 1 | -2/+6 |
* | | | | | | Merge branch 'tb/push-to-cygwin-unc-path' into maint | Junio C Hamano | 2017-07-31 | 5 | -0/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cygwin: allow pushing to UNC paths | Torsten Bögershausen | 2017-07-05 | 5 | -0/+27 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs/apply-avoid-over-reading' into maint | Junio C Hamano | 2017-07-31 | 1 | -4/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name() | René Scharfe | 2017-07-09 | 1 | -2/+1 |
| * | | | | | | apply: use starts_with() in gitdiff_verify_name() | René Scharfe | 2017-07-01 | 1 | -2/+1 |
* | | | | | | | fixes from 'master' for 2.13.4 | Junio C Hamano | 2017-07-22 | 2 | -1/+11 |
* | | | | | | | Merge branch 'ew/fd-cloexec-fix' into maint | Junio C Hamano | 2017-07-22 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | set FD_CLOEXEC properly when O_CLOEXEC is not supported | Eric Wong | 2017-07-17 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'ks/fix-rebase-doc-picture' into maint | Junio C Hamano | 2017-07-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: correct a mistake in an illustration | Kaartic Sivaraam | 2017-07-10 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'js/alias-case-sensitivity' into maint | Junio C Hamano | 2017-07-22 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | alias: compare alias name *case-insensitively* | Johannes Schindelin | 2017-07-17 | 2 | -2/+2 |
| * | | | | | | | | | t1300: demonstrate that CamelCased aliases regressed | Johannes Schindelin | 2017-07-17 | 1 | -0/+7 |
* | | | | | | | | | | Merge branch 'bb/unicode-10.0' into maint | Junio C Hamano | 2017-07-22 | 1 | -13/+29 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | unicode: update the width tables to Unicode 10 | Beat Bolli | 2017-07-07 | 1 | -13/+29 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Git 2.13.3v2.13.3 | Junio C Hamano | 2017-07-13 | 2 | -1/+10 |
* | | | | | | | | | Merge branch 'kn/ref-filter-branch-list' into maint | Junio C Hamano | 2017-07-13 | 3 | -7/+54 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ref-filter.c: drop return from void function | Alejandro R. Sedeño | 2017-07-10 | 1 | -1/+1 |
| * | | | | | | | | | branch: set remote color in ref-filter branch immediately | Jeff King | 2017-07-09 | 1 | -5/+6 |
| * | | | | | | | | | branch: use BRANCH_COLOR_LOCAL in ref-filter format | Jeff King | 2017-07-09 | 2 | -2/+47 |
| * | | | | | | | | | branch: only perform HEAD check for local branches | Jeff King | 2017-07-09 | 1 | -1/+2 |
* | | | | | | | | | | Merge branch 'ks/typofix-commit-c-comment' into maint | Junio C Hamano | 2017-07-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/commit.c: fix a typo in the comment | Kaartic Sivaraam | 2017-07-06 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jk/reflog-walk-maint' into maint | Junio C Hamano | 2017-07-13 | 3 | -12/+42 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | reflog-walk: include all fields when freeing complete_reflogs | Jeff King | 2017-07-07 | 1 | -8/+18 |
| * | | | | | | | | | reflog-walk: don't free reflogs added to cache | Jeff King | 2017-07-07 | 2 | -4/+4 |
| * | | | | | | | | | reflog-walk: duplicate strings in complete_reflogs list | Jeff King | 2017-07-07 | 2 | -0/+7 |
| * | | | | | | | | | reflog-walk: skip over double-null oid due to HEAD rename | Jeff King | 2017-07-05 | 2 | -0/+13 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Prepare for 2.13.3 | Junio C Hamano | 2017-07-10 | 2 | -1/+54 |
* | | | | | | | | | Merge branch 'sb/merge-recursive-code-cleanup' into maint | Junio C Hamano | 2017-07-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge-recursive: use DIFF_XDL_SET macro | Stefan Beller | 2017-06-30 | 1 | -3/+3 |
| |/ / / / / / / / |