Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/capabilities' | Junio C Hamano | 2012-08-29 | 8 | -17/+102 |
|\ | |||||
| * | fetch-pack: mention server version with verbose output | Jeff King | 2012-08-13 | 1 | -1/+8 |
| * | parse_feature_request: make it easier to see feature values | Jeff King | 2012-08-13 | 2 | -10/+39 |
| * | fetch-pack: do not ask for unadvertised capabilities | Junio C Hamano | 2012-08-10 | 1 | -0/+6 |
| * | do not send client agent unless server does first | Jeff King | 2012-08-10 | 2 | -4/+15 |
| * | send-pack: fix capability-sending logic | Jeff King | 2012-08-10 | 1 | -1/+1 |
| * | include agent identifier in capability string | Jeff King | 2012-08-03 | 6 | -6/+38 |
* | | Merge branch 'mg/rebase-i-onto-reflog-in-full' | Junio C Hamano | 2012-08-29 | 1 | -2/+1 |
|\ \ | |||||
| * | | rebase -i: use full onto sha1 in reflog | Michael J Gruber | 2012-08-10 | 1 | -2/+1 |
* | | | Merge branch 'mz/empty-rebase-test' | Junio C Hamano | 2012-08-29 | 1 | -1/+17 |
|\ \ \ | |||||
| * | | | add tests for 'git rebase --keep-empty' | Martin von Zweigbergk | 2012-08-09 | 1 | -1/+17 |
* | | | | Merge branch 'jc/maint-protect-sh-from-ifs' | Junio C Hamano | 2012-08-29 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | sh-setup: protect from exported IFS | Junio C Hamano | 2012-08-08 | 1 | -0/+4 |
* | | | | | Merge branch 'bc/prune-info' | Junio C Hamano | 2012-08-29 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | prune.c: only print informational message in show_only or verbose mode | Brandon Casey | 2012-08-07 | 1 | -1/+2 |
* | | | | | | Merge branch 'mz/cherry-code-cleanup' | Junio C Hamano | 2012-08-29 | 1 | -16/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cherry: remove redundant check for merge commit | Martin von Zweigbergk | 2012-07-29 | 1 | -8/+2 |
| * | | | | | | cherry: don't set ignored rev_info options | Martin von Zweigbergk | 2012-07-29 | 1 | -4/+0 |
| * | | | | | | remove unnecessary parameter from get_patch_ids() | Martin von Zweigbergk | 2012-07-29 | 1 | -4/+4 |
* | | | | | | | First half of the second batch for 1.8.0 | Junio C Hamano | 2012-08-27 | 1 | -0/+37 |
* | | | | | | | Merge branch 'jk/docs-docbook-monospace-display' | Junio C Hamano | 2012-08-27 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs: monospace listings in docbook output | Jeff King | 2012-08-07 | 2 | -3/+3 |
* | | | | | | | | Merge branch 'da/difftool-updates' | Junio C Hamano | 2012-08-27 | 6 | -101/+244 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | difftool: silence warning | Ross Lagerwall | 2012-08-21 | 1 | -1/+1 |
| * | | | | | | | | Add Code Compare v2.80.4 as a merge / diff tool for Windows | Sebastian Schuberth | 2012-08-10 | 3 | -2/+27 |
| * | | | | | | | | mergetool,difftool: Document --tool-help consistently | David Aguilar | 2012-08-10 | 2 | -3/+6 |
| * | | | | | | | | difftool: Disable --symlinks on cygwin | David Aguilar | 2012-07-26 | 1 | -1/+2 |
| * | | | | | | | | difftool: Handle compare() returning -1 | David Aguilar | 2012-07-26 | 1 | -31/+68 |
| * | | | | | | | | difftool: Wrap long lines for readability | David Aguilar | 2012-07-26 | 1 | -14/+32 |
| * | | | | | | | | difftool: Check all return codes from compare() | David Aguilar | 2012-07-25 | 1 | -1/+10 |
| * | | | | | | | | difftool: Handle finding mergetools/ in a path with spaces | David Aguilar | 2012-07-25 | 1 | -6/+21 |
| * | | | | | | | | difftool: Use symlinks when diffing against the worktree | David Aguilar | 2012-07-23 | 2 | -10/+31 |
| * | | | | | | | | difftool: Call the temp directory "git-difftool" | David Aguilar | 2012-07-22 | 1 | -1/+1 |
| * | | | | | | | | difftool: Move option values into a hash | David Aguilar | 2012-07-22 | 1 | -24/+31 |
| * | | | | | | | | difftool: Eliminate global variables | David Aguilar | 2012-07-22 | 1 | -53/+75 |
| * | | | | | | | | difftool: Simplify print_tool_help() | David Aguilar | 2012-07-22 | 1 | -20/+5 |
* | | | | | | | | | Merge branch 'js/grep-patterntype-config' | Junio C Hamano | 2012-08-27 | 5 | -42/+281 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | grep: add a grep.patternType configuration setting | J Smith | 2012-08-03 | 5 | -42/+281 |
* | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' | Junio C Hamano | 2012-08-27 | 2 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | receive-pack: do not leak output from auto-gc to standard output | Junio C Hamano | 2012-08-06 | 2 | -2/+3 |
| * | | | | | | | | | | t/t5400: demonstrate breakage caused by informational message from prune | Brandon Casey | 2012-08-06 | 1 | -0/+35 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ab/diff-write-incomplete-line' | Junio C Hamano | 2012-08-27 | 2 | -0/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix '\ No newline...' annotation in rewrite diffs | Adam Butcher | 2012-08-05 | 2 | -0/+31 |
* | | | | | | | | | | | Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' | Junio C Hamano | 2012-08-27 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t7406: fix misleading "rev-parse --max-count=1 HEAD" | Junio C Hamano | 2012-07-30 | 1 | -8/+8 |
* | | | | | | | | | | | | Merge branch 'jk/maint-null-in-trees' | Junio C Hamano | 2012-08-27 | 18 | -32/+188 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fsck: detect null sha1 in tree entries | Jeff King | 2012-07-29 | 2 | -1/+33 |
| * | | | | | | | | | | | | do not write null sha1s to on-disk index | Jeff King | 2012-07-29 | 2 | -0/+21 |
| * | | | | | | | | | | | | diff: do not use null sha1 as a sentinel value | Jeff King | 2012-07-29 | 14 | -32/+135 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'mm/push-default-switch-warning' | Junio C Hamano | 2012-08-27 | 2 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ |