summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | Merge branch 'np/maint-sideband-favor-status' into maintJunio C Hamano2009-12-032-23/+23
|\ \
| * | give priority to progress messagesNicolas Pitre2009-11-132-23/+23
* | | Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano2009-12-031-0/+7
* | | Git 1.6.5.4v1.6.5.4Junio C Hamano2009-12-032-2/+3
* | | Unconditionally set man.base.url.for.relative.linksJunio C Hamano2009-12-031-2/+5
* | | Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano2009-12-031-0/+4
* | | Prepare for 1.6.5.4Junio C Hamano2009-12-022-1/+33
* | | merge: do not add standard message when message is given with -m optionJunio C Hamano2009-12-022-11/+10
* | | Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano2009-12-021-1/+1
* | | help: Do not unnecessarily look for a repositoryDavid Aguilar2009-12-011-3/+3
* | | Documentation: Fix a few i.e./e.g. mix-upsMichael J Gruber2009-12-012-2/+2
* | | Documentation: Document --branch option in git clone synopsisDavid Soria Parra2009-11-301-1/+1
* | | builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-262-2/+20
* | | pack-objects: split implications of --all-progress from progress activationNicolas Pitre2009-11-234-5/+20
* | | instaweb: restart server if already runningStephen Boyd2009-11-231-0/+5
* | | prune-packed: only show progress when stderr is a ttyJeff King2009-11-231-1/+1
View Lorry Controller Status