Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | log: diagnose empty HEAD more clearlyjk/log-missing-default-HEAD | Jeff King | 2015-08-31 | 2 | -1/+30 |
* | Sixth batch for 2.5 cycle | Junio C Hamano | 2015-06-01 | 1 | -1/+50 |
* | Merge branch 'sb/test-bitmap-free-at-end' | Junio C Hamano | 2015-06-01 | 1 | -1/+1 |
|\ | |||||
| * | test_bitmap_walk: free bitmap with bitmap_freesb/test-bitmap-free-at-end | Jeff King | 2015-05-22 | 1 | -1/+1 |
* | | Merge branch 'mm/rebase-i-post-rewrite-exec' | Junio C Hamano | 2015-06-01 | 2 | -41/+58 |
|\ \ | |||||
| * | | t5407: use <<- to align the expected outputmm/rebase-i-post-rewrite-exec | Junio C Hamano | 2015-05-22 | 1 | -40/+40 |
| * | | rebase -i: fix post-rewrite hook with failed exec command | Matthieu Moy | 2015-05-22 | 2 | -6/+6 |
| * | | rebase -i: demonstrate incorrect behavior of post-rewrite | Matthieu Moy | 2015-05-22 | 1 | -0/+17 |
* | | | Merge branch 'fm/fetch-raw-sha1' | Junio C Hamano | 2015-06-01 | 6 | -16/+116 |
|\ \ \ | |||||
| * | | | upload-pack: optionally allow fetching reachable sha1fm/fetch-raw-sha1 | Fredrik Medley | 2015-05-22 | 6 | -6/+97 |
| * | | | upload-pack: prepare to extend allow-tip-sha1-in-want | Fredrik Medley | 2015-05-22 | 2 | -10/+19 |
| * | | | config.txt: clarify allowTipSHA1InWant with camelCase | Fredrik Medley | 2015-05-21 | 1 | -2/+2 |
* | | | | Merge branch 'sg/help-group' | Junio C Hamano | 2015-06-01 | 7 | -51/+117 |
|\ \ \ \ | |||||
| * | | | | help: respect new common command grouping | Sébastien Guimmara | 2015-05-21 | 1 | -1/+23 |
| * | | | | command-list.txt: drop the "common" tag | Sébastien Guimmara | 2015-05-21 | 1 | -21/+21 |
| * | | | | generate-cmdlist: parse common group commands | Eric Sunshine | 2015-05-21 | 3 | -25/+52 |
| * | | | | command-list.txt: add the common groups block | Sébastien Guimmara | 2015-05-21 | 2 | -21/+33 |
| * | | | | command-list: prepare machinery for upcoming "common groups" section | Eric Sunshine | 2015-05-21 | 3 | -3/+8 |
* | | | | | Merge branch 'mm/log-format-raw-doc' | Junio C Hamano | 2015-06-01 | 2 | -2/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/log: clarify sha1 non-abbreviation in log --rawmm/log-format-raw-doc | Matthieu Moy | 2015-05-20 | 1 | -1/+4 |
| * | | | | | Documentation/log: clarify what --raw means | Matthieu Moy | 2015-05-18 | 1 | -1/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dt/cat-file-follow-symlinks' | Junio C Hamano | 2015-06-01 | 7 | -19/+601 |
|\ \ \ \ \ | |||||
| * | | | | | cat-file: add --follow-symlinks to --batchdt/cat-file-follow-symlinks | David Turner | 2015-05-20 | 3 | -7/+348 |
| * | | | | | sha1_name: get_sha1_with_context learns to follow symlinks | David Turner | 2015-05-20 | 2 | -12/+28 |
| * | | | | | tree-walk: learn get_tree_entry_follow_symlinks | David Turner | 2015-05-20 | 2 | -0/+224 |
* | | | | | | Merge branch 'rs/janitorial' | Junio C Hamano | 2015-06-01 | 7 | -26/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | dir: remove unused variable sbrs/janitorial | René Scharfe | 2015-05-20 | 1 | -2/+0 |
| * | | | | | | clean: remove unused variable buf | René Scharfe | 2015-05-20 | 1 | -2/+0 |
| * | | | | | | use file_exists() to check if a file exists in the worktree | René Scharfe | 2015-05-20 | 5 | -22/+9 |
* | | | | | | | Merge branch 'jk/stash-options' | Junio C Hamano | 2015-06-01 | 2 | -1/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | stash: recognize "--help" for subcommandsjk/stash-options | Jeff King | 2015-05-20 | 1 | -0/+11 |
| * | | | | | | | stash: complain about unknown flags | Jeff King | 2015-05-20 | 2 | -1/+9 |
* | | | | | | | | Merge branch 'da/mergetool-winmerge' | Junio C Hamano | 2015-06-01 | 3 | -2/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | mergetools: add winmerge as a builtin tool | David Aguilar | 2015-05-20 | 1 | -0/+36 |
| * | | | | | | | | mergetool--lib: set IFS for difftool and mergetool | David Aguilar | 2015-05-20 | 2 | -2/+3 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mc/commit-doc-grammofix' | Junio C Hamano | 2015-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/git-commit: grammofixmc/commit-doc-grammofix | Michael Coleman | 2015-05-19 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jh/filter-empty-contents' | Junio C Hamano | 2015-06-01 | 2 | -1/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sha1_file: pass empty buffer to index empty filejh/filter-empty-contents | Jim Hill | 2015-05-18 | 2 | -1/+27 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-06-01 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | blame, log: format usage strings similarly to those in documentationah/usage-strings | Alex Henrie | 2015-05-03 | 2 | -2/+2 |
* | | | | | | | | | | Merge branch 'jk/http-backend-deadlock' | Junio C Hamano | 2015-06-01 | 3 | -29/+139 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlockjk/http-backend-deadlock | Junio C Hamano | 2015-05-25 | 3 | -29/+139 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 | 3 | -29/+139 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2 | Jeff King | 2015-05-25 | 3 | -11/+105 |
| | | * | | | | | | | | | t5551: factor out tag creation | Jeff King | 2015-05-20 | 1 | -13/+21 |
| | | * | | | | | | | | | http-backend: fix die recursion with custom handler | Jeff King | 2015-05-15 | 1 | -5/+9 |
| | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'dt/clean-pathspec-filter-then-lstat' | Junio C Hamano | 2015-06-01 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | clean: only lstat files in pathspecdt/clean-pathspec-filter-then-lstat | David Turner | 2015-05-18 | 1 | -3/+3 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'nd/untracked-cache' | Junio C Hamano | 2015-05-27 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ |