| Commit message (Expand) | Author | Age | Files | Lines |
* | reset: unbreak hard resets with GIT_WORK_TREE | Jeff King | 2009-12-30 | 2 | -4/+8 |
* | reset: improve worktree safety valves | Jeff King | 2009-12-05 | 2 | -5/+33 |
* | Documentation: Avoid use of xmlto --stringparam | Todd Zullinger | 2009-12-05 | 3 | -11/+23 |
* | archive: clarify description of path parameter | René Scharfe | 2009-12-04 | 1 | -2/+3 |
* | rerere: don't segfault on failure to open rr-cache | Jeff King | 2009-12-04 | 1 | -0/+2 |
* | Prepare for 1.6.5.5 | Junio C Hamano | 2009-12-03 | 1 | -0/+44 |
* | Merge branch 'uk/maint-shortlog-encoding' into maint | Junio C Hamano | 2009-12-03 | 2 | -9/+39 |
|\ |
|
| * | t4201: use ISO8859-1 rather than ISO-8859-1 | Brandon Casey | 2009-12-03 | 1 | -2/+2 |
| * | shortlog: respect commit encoding | Uwe Kleine-König | 2009-11-25 | 2 | -9/+39 |
* | | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint | Junio C Hamano | 2009-12-03 | 2 | -1/+7 |
|\ \ |
|
| * | | format-patch: add test for parsing of "--" | Felipe Contreras | 2009-11-26 | 1 | -0/+5 |
| * | | format-patch: fix parsing of "--" on the command line | Felipe Contreras | 2009-11-26 | 1 | -1/+2 |
| |/ |
|
* | | Merge branch 'ap/maint-merge-strategy-list-fix' into maint | Junio C Hamano | 2009-12-03 | 1 | -1/+1 |
|\ \ |
|
| * | | builtin-merge.c: call exclude_cmds() correctly. | Avery Pennarun | 2009-11-29 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'jc/maint-am-keep' into maint | Junio C Hamano | 2009-12-03 | 1 | -5/+6 |
|\ \ |
|
| * | | Remove dead code from "git am" | Junio C Hamano | 2009-11-27 | 1 | -5/+6 |
* | | | Merge branch 'rs/work-around-grep-opt-insanity' into maint | Junio C Hamano | 2009-12-03 | 9 | -25/+32 |
|\ \ \ |
|
| * | | | Protect scripted Porcelains from GREP_OPTIONS insanity | Junio C Hamano | 2009-11-23 | 8 | -18/+26 |
| * | | | mergetool--lib: simplify guess_merge_tool() | René Scharfe | 2009-11-23 | 1 | -7/+6 |
| | |/
| |/| |
|
* | | | Merge branch 'rj/maint-cygwin-count-objects' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | git-count-objects: Fix a disk-space under-estimate on Cygwin | Ramsay Jones | 2009-11-19 | 1 | -0/+1 |
| |/ / |
|
* | | | Merge branch 'mm/maint-hint-failed-merge' into maint | Junio C Hamano | 2009-12-03 | 5 | -3/+32 |
|\ \ \ |
|
| * | | | user-manual: Document that "git merge" doesn't like uncommited changes. | Matthieu Moy | 2009-11-22 | 1 | -2/+18 |
| * | | | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy | 2009-11-22 | 4 | -1/+14 |
| |/ / |
|
* | | | Merge branch 'th/maint-remote-update-help-string' into maint | Junio C Hamano | 2009-12-03 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Update 'git remote update' usage string to match man page. | Tim Henigan | 2009-11-15 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'rj/maint-t9700' into maint | Junio C Hamano | 2009-12-03 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | t9700-perl-git.sh: Fix a test failure on Cygwin | Ramsay Jones | 2009-11-19 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'ls/maint-mailinfo-no-inbody' into maint | Junio C Hamano | 2009-12-03 | 16 | -5/+122 |
|\ \ \ |
|
| * | | | git am/mailinfo: Don't look at in-body headers when rebasing | Lukas Sandström | 2009-11-20 | 16 | -5/+122 |
| |/ / |
|
* | | | Merge branch 'mo/maint-crlf-doc' into maint | Junio C Hamano | 2009-12-03 | 1 | -3/+4 |
|\ \ \ |
|
| * | | | core.autocrlf documentation: mention the crlf attribute | Matthew Ogilvie | 2009-11-16 | 1 | -3/+4 |
| |/ / |
|
* | | | Merge branch 'th/remote-usage' into maint | Junio C Hamano | 2009-12-03 | 2 | -21/+52 |
|\ \ \ |
|
| * | | | git remote: Separate usage strings for subcommands | Tim Henigan | 2009-11-20 | 2 | -21/+52 |
| |/ / |
|
* | | | Merge branch 'pb/maint-use-custom-perl' into maint | Junio C Hamano | 2009-12-03 | 4 | -4/+5 |
|\ \ \ |
|
| * | | | Make sure $PERL_PATH is defined when the test suite is run. | Philippe Bruhat (BooK) | 2009-11-17 | 4 | -4/+5 |
| |/ / |
|
* | | | Merge branch 'mm/config-pathname-tilde-expand' into maint | Junio C Hamano | 2009-12-03 | 5 | -37/+69 |
|\ \ \ |
|
| * | | | Documentation: avoid xmlto input error | Junio C Hamano | 2009-11-21 | 1 | -3/+3 |
| * | | | expand_user_path: expand ~ to $HOME, not to the actual homedir. | Matthieu Moy | 2009-11-19 | 2 | -8/+14 |
| * | | | Expand ~ and ~user in core.excludesfile, commit.template | Matthieu Moy | 2009-11-17 | 5 | -37/+63 |
| |/ / |
|
* | | | Merge branch 'bc/grep-i-F' into maint | Junio C Hamano | 2009-12-03 | 4 | -6/+27 |
|\ \ \ |
|
| * | | | grep: Allow case insensitive search of fixed-strings | Brian Collins | 2009-11-16 | 4 | -6/+27 |
| |/ / |
|
* | | | Merge branch 'jk/maint-break-rename-reduce-memory' into maint | Junio C Hamano | 2009-12-03 | 2 | -3/+10 |
|\ \ \ |
|
| * | | | diffcore-rename: reduce memory footprint by freeing blob data early | Junio C Hamano | 2009-11-20 | 1 | -2/+5 |
| * | | | diffcore-break: save cnt_data for other phases | Jeff King | 2009-11-16 | 1 | -3/+3 |
| * | | | diffcore-break: free filespec data as we go | Jeff King | 2009-11-16 | 1 | -0/+4 |
| |/ / |
|
* | | | Merge branch 'rj/maint-simplify-cygwin-makefile' into maint | Junio C Hamano | 2009-12-03 | 1 | -4/+2 |
|\ \ \ |
|
| * | | | Makefile: merge two Cygwin configuration sections into one | Ramsay Jones | 2009-11-08 | 1 | -4/+2 |
| |/ / |
|
* | | | Merge branch 'rg/doc-workflow' into maint | Junio C Hamano | 2009-12-03 | 1 | -0/+115 |
|\ \ \ |
|
| * | | | Add branch management for releases to gitworkflows | Raman Gupta | 2009-11-20 | 1 | -0/+115 |
| |/ / |
|