aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-29
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jc/maint-am-keep' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove dead code from "git am"Junio C Hamano2009-11-27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/work-around-grep-opt-insanity' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Protect scripted Porcelains from GREP_OPTIONS insanityJunio C Hamano2009-11-23
| * | | | | | | | | | mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-23
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rj/maint-cygwin-count-objects' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-count-objects: Fix a disk-space under-estimate on CygwinRamsay Jones2009-11-19
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/maint-hint-failed-merge' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | user-manual: Document that "git merge" doesn't like uncommited changes.Matthieu Moy2009-11-22
| * | | | | | | | | | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-22
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'th/maint-remote-update-help-string' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update 'git remote update' usage string to match man page.Tim Henigan2009-11-15
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rj/maint-t9700' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t9700-perl-git.sh: Fix a test failure on CygwinRamsay Jones2009-11-19
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ls/maint-mailinfo-no-inbody' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git am/mailinfo: Don't look at in-body headers when rebasingLukas Sandström2009-11-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mo/maint-crlf-doc' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | core.autocrlf documentation: mention the crlf attributeMatthew Ogilvie2009-11-16
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'th/remote-usage' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git remote: Separate usage strings for subcommandsTim Henigan2009-11-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure $PERL_PATH is defined when the test suite is run.Philippe Bruhat (BooK)2009-11-17
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: avoid xmlto input errorJunio C Hamano2009-11-21
| * | | | | | | | | | expand_user_path: expand ~ to $HOME, not to the actual homedir.Matthieu Moy2009-11-19
| * | | | | | | | | | Expand ~ and ~user in core.excludesfile, commit.templateMatthieu Moy2009-11-17
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'bc/grep-i-F' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: Allow case insensitive search of fixed-stringsBrian Collins2009-11-16
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/maint-break-rename-reduce-memory' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diffcore-rename: reduce memory footprint by freeing blob data earlyJunio C Hamano2009-11-20
| * | | | | | | | | | diffcore-break: save cnt_data for other phasesJeff King2009-11-16
| * | | | | | | | | | diffcore-break: free filespec data as we goJeff King2009-11-16
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rj/maint-simplify-cygwin-makefile' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: merge two Cygwin configuration sections into oneRamsay Jones2009-11-08
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rg/doc-workflow' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add branch management for releases to gitworkflowsRaman Gupta2009-11-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'np/maint-sideband-favor-status' into maintJunio C Hamano2009-12-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | give priority to progress messagesNicolas Pitre2009-11-13
* | | | | | | | | | | Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano2009-12-03
* | | | | | | | | | | Git 1.6.5.4v1.6.5.4Junio C Hamano2009-12-03
* | | | | | | | | | | Unconditionally set man.base.url.for.relative.linksJunio C Hamano2009-12-03
* | | | | | | | | | | Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano2009-12-03
* | | | | | | | | | | Prepare for 1.6.5.4Junio C Hamano2009-12-02
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | merge: do not add standard message when message is given with -m optionJunio C Hamano2009-12-02
* | | | | | | | | | Do not misidentify "git merge foo HEAD" as an old-style invocationJunio C Hamano2009-12-02
* | | | | | | | | | help: Do not unnecessarily look for a repositoryDavid Aguilar2009-12-01
* | | | | | | | | | Documentation: Fix a few i.e./e.g. mix-upsMichael J Gruber2009-12-01
* | | | | | | | | | Documentation: Document --branch option in git clone synopsisDavid Soria Parra2009-11-30
* | | | | | | | | | builtin-apply.c: pay attention to -p<n> when determining the nameJunio C Hamano2009-11-26