summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds2009-12-051-1/+10
* reset: improve worktree safety valvesJeff King2009-12-052-5/+33
* Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-053-11/+23
* archive: clarify description of path parameterRené Scharfe2009-12-041-2/+3
* rerere: don't segfault on failure to open rr-cacheJeff King2009-12-041-0/+2
* Prepare for 1.6.5.5Junio C Hamano2009-12-031-0/+44
* Merge branch 'uk/maint-shortlog-encoding' into maintJunio C Hamano2009-12-032-9/+39
|\
| * t4201: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-12-031-2/+2
| * shortlog: respect commit encodingUwe Kleine-König2009-11-252-9/+39
* | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maintJunio C Hamano2009-12-032-1/+7
|\ \
| * | format-patch: add test for parsing of "--"Felipe Contreras2009-11-261-0/+5
| * | format-patch: fix parsing of "--" on the command lineFelipe Contreras2009-11-261-1/+2
| |/
* | Merge branch 'ap/maint-merge-strategy-list-fix' into maintJunio C Hamano2009-12-031-1/+1
|\ \
| * | builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-291-1/+1
| |/
* | Merge branch 'jc/maint-am-keep' into maintJunio C Hamano2009-12-031-5/+6
|\ \
| * | Remove dead code from "git am"Junio C Hamano2009-11-271-5/+6
* | | Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-039-25/+32
|\ \ \
| * | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-238-18/+26
| * | | mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-231-7/+6
| | |/ | |/|
* | | Merge branch 'rj/maint-cygwin-count-objects' into maintJunio C Hamano2009-12-031-0/+1
|\ \ \
| * | | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-191-0/+1
| |/ /
* | | Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-035-3/+32
|\ \ \
| * | | user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy2009-11-221-2/+18
| * | | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-224-1/+14
| |/ /
* | | Merge branch 'th/maint-remote-update-help-string' into maintJunio C Hamano2009-12-031-1/+1
|\ \ \
| * | | Update 'git remote update' usage string to match man page.Tim Henigan2009-11-151-1/+1
| |/ /
* | | Merge branch 'rj/maint-t9700' into maintJunio C Hamano2009-12-031-1/+1
|\ \ \
| * | | t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones2009-11-191-1/+1
| |/ /
* | | Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano2009-12-0316-5/+122
|\ \ \
| * | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-2016-5/+122
| |/ /
* | | Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-031-3/+4
|\ \ \
| * | | core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie2009-11-161-3/+4
| |/ /
* | | Merge branch 'th/remote-usage' into maintJunio C Hamano2009-12-032-21/+52
|\ \ \
| * | | git remote: Separate usage strings for subcommandsTim Henigan2009-11-202-21/+52
| |/ /
* | | Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-034-4/+5
|\ \ \
| * | | Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)2009-11-174-4/+5
| |/ /
* | | Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-035-37/+69
|\ \ \
| * | | Documentation: avoid xmlto input errorJunio C Hamano2009-11-211-3/+3
| * | | expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2009-11-192-8/+14
| * | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-175-37/+63
| |/ /
* | | Merge branch 'bc/grep-i-F' into maintJunio C Hamano2009-12-034-6/+27
|\ \ \
| * | | grep: Allow case insensitive search of fixed-stringsBrian Collins2009-11-164-6/+27
| |/ /
* | | Merge branch 'jk/maint-break-rename-reduce-memory' into maintJunio C Hamano2009-12-032-3/+10
|\ \ \
| * | | diffcore-rename: reduce memory footprint by freeing blob data earlyJunio C Hamano2009-11-201-2/+5
| * | | diffcore-break: save cnt_data for other phasesJeff King2009-11-161-3/+3
| * | | diffcore-break: free filespec data as we goJeff King2009-11-161-0/+4
| |/ /
* | | Merge branch 'rj/maint-simplify-cygwin-makefile' into maintJunio C Hamano2009-12-031-4/+2
|\ \ \
| * | | Makefile: merge two Cygwin configuration sections into oneRamsay Jones2009-11-081-4/+2
| |/ /
* | | Merge branch 'rg/doc-workflow' into maintJunio C Hamano2009-12-031-0/+115
|\ \ \
| * | | Add branch management for releases to gitworkflowsRaman Gupta2009-11-201-0/+115
| |/ /
View Lorry Controller Status