Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/refresh-beyond-symlink' | Junio C Hamano | 2014-09-09 | 1 | -0/+43 |
|\ | |||||
| * | read-cache: check for leading symlinks when refreshing indexrs/refresh-beyond-symlink | René Scharfe | 2014-08-10 | 1 | -0/+43 |
* | | Merge branch 'jk/stash-list-p' | Junio C Hamano | 2014-09-09 | 1 | -0/+42 |
|\ \ | |||||
| * | | stash: default listing to working-tree diffjk/stash-list-p | Jeff King | 2014-08-07 | 1 | -0/+42 |
| |/ | |||||
* | | Merge branch 'lf/bundle-exclusion' | Junio C Hamano | 2014-09-09 | 1 | -1/+4 |
|\ \ | |||||
| * | | bundle: fix exclusion of annotated tagslf/bundle-exclusion | Lukas Fleischer | 2014-08-07 | 1 | -1/+4 |
* | | | Merge branch 'jc/apply-ws-prefix' | Junio C Hamano | 2014-09-09 | 2 | -0/+28 |
|\ \ \ | |||||
| * | | | apply: omit ws check for excluded pathsjc/apply-ws-prefix | Junio C Hamano | 2014-08-07 | 1 | -0/+11 |
| * | | | apply: use the right attribute for paths in non-Git patches | Junio C Hamano | 2014-08-07 | 1 | -0/+17 |
| | |/ | |/| | |||||
| * | | Merge branch 'maint-1.8.5' into maint-1.9 | Junio C Hamano | 2014-07-16 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
* | | | Merge branch 'jk/command-line-config-empty-string' | Junio C Hamano | 2014-09-09 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | config: teach "git -c" to recognize an empty stringjk/command-line-config-empty-string | Junio C Hamano | 2014-08-05 | 1 | -0/+11 |
| | |/ | |/| | |||||
* | | | Merge branch 'jc/not-mingw-cygwin' | Junio C Hamano | 2014-09-09 | 15 | -60/+56 |
|\ \ \ | |||||
| * | | | test prerequisites: enumerate with commasjc/not-mingw-cygwin | Junio C Hamano | 2014-07-21 | 2 | -9/+9 |
| * | | | test prerequisites: eradicate NOT_FOO | Junio C Hamano | 2014-07-21 | 15 | -60/+56 |
* | | | | Merge branch 'bc/archive-pax-header-mode' | Junio C Hamano | 2014-09-02 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | archive: honor tar.umask even for pax headersbc/archive-pax-header-mode | brian m. carlson | 2014-08-04 | 1 | -0/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-09-02 | 1 | -0/+200 |
|\ \ \ \ | |||||
| * | | | | test-config: add tests for the config_set API | Tanay Abhra | 2014-07-29 | 1 | -0/+200 |
* | | | | | Merge branch 'jk/diff-tree-t-fix' | Junio C Hamano | 2014-08-26 | 1 | -0/+34 |
|\ \ \ \ \ | |||||
| * | | | | | intersect_paths: respect mode in git's tree-sortjk/diff-tree-t-fix | Jeff King | 2014-08-20 | 1 | -0/+34 |
* | | | | | | Merge branch 'jk/pack-shallow-always-without-bitmap' | Junio C Hamano | 2014-08-26 | 1 | -0/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack-objects: turn off bitmaps when we see --shallow linesjk/pack-shallow-always-without-bitmap | Jeff King | 2014-08-12 | 1 | -0/+39 |
* | | | | | | | tests: fix negated test_i18ngrep calls | Johannes Sixt | 2014-08-13 | 3 | -6/+6 |
* | | | | | | | Sync with 2.0.4 | Junio C Hamano | 2014-07-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | commit --amend: test specifies authorship but forgets to check | Fabian Ruch | 2014-07-30 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'sk/mingw-tests-workaround' | Junio C Hamano | 2014-07-30 | 8 | -24/+51 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | t800[12]: work around MSys limitationsk/mingw-tests-workaround | Karsten Blees | 2014-07-21 | 1 | -0/+12 |
| * | | | | | | | t9902: mingw-specific fix for gitfile link files | Pat Thoyts | 2014-07-21 | 1 | -4/+13 |
| * | | | | | | | t4210: skip command-line encoding tests on mingw | Pat Thoyts | 2014-07-21 | 1 | -2/+2 |
| * | | | | | | | MinGW: disable legacy encoding tests | Karsten Blees | 2014-07-21 | 3 | -15/+18 |
| * | | | | | | | t0110/MinGW: skip tests that pass arbitrary bytes on the command line | Karsten Blees | 2014-07-21 | 1 | -2/+5 |
| * | | | | | | | MinGW: Skip test redirecting to fd 4 | Johannes Schindelin | 2014-07-17 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'sk/mingw-uni-fix-more' | Junio C Hamano | 2014-07-30 | 4 | -7/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | tests: do not pass iso8859-1 encoded parameter | Pat Thoyts | 2014-07-15 | 4 | -7/+13 |
* | | | | | | | | | Merge branch 'ep/avoid-test-a-o' | Junio C Hamano | 2014-07-30 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t9814: fix misconversion from test $a -o $b to test $a || test $bep/avoid-test-a-o | Junio C Hamano | 2014-07-25 | 1 | -2/+8 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2014-07-28 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | t4013: test diff-tree's --stdin commit formatting | Jeff King | 2014-07-28 | 1 | -0/+10 |
| * | | | | | | | | | Merge branch 'zk/log-graph-showsig' into maint | Junio C Hamano | 2014-07-22 | 1 | -0/+31 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint | Junio C Hamano | 2014-07-22 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/dedup-test-config' into maint | Junio C Hamano | 2014-07-22 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sk/test-cmp-bin' into maint | Junio C Hamano | 2014-07-22 | 5 | -22/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'lt/request-pull' into maint | Junio C Hamano | 2014-07-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ep/shell-assign-and-export-vars' into maint | Junio C Hamano | 2014-07-22 | 2 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pretty-G-format-fixes' into maint | Junio C Hamano | 2014-07-16 | 2 | -9/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bc/fix-rebase-merge-skip' into maint | Junio C Hamano | 2014-07-16 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/trim-trailing-spaces' into maint | Junio C Hamano | 2014-07-10 | 1 | -0/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/repack-pack-keep-objects' into maint | Junio C Hamano | 2014-07-10 | 1 | -2/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | t1402: check for refs ending with a dot | Jeff King | 2014-07-28 | 1 | -0/+1 |