summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/maint-use-custom-perl' into maintJunio C Hamano2009-12-034-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/config-pathname-tilde-expand' into maintJunio C Hamano2009-12-035-37/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/grep-i-F' into maintJunio C Hamano2009-12-034-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-break-rename-reduce-memory' into maintJunio C Hamano2009-12-032-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/maint-simplify-cygwin-makefile' into maintJunio C Hamano2009-12-031-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rg/doc-workflow' into maintJunio C Hamano2009-12-031-0/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'np/maint-sideband-favor-status' into maintJunio C Hamano2009-12-032-23/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: xmlto 0.0.18 does not know --stringparamJunio C Hamano2009-12-031-0/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Describe (possible) gitweb.js minification in gitweb/READMEJakub Narebski2009-12-031-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix crasher on encountering SHA1-like non-note in notes treeJohan Herland2009-12-032-0/+174
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2009-12-031-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge in 1.6.5.4Junio C Hamano2009-12-032-3/+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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation/Makefile: allow man.base.url.for.relative.link to be set from MakeJunio C Hamano2009-12-031-0/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 1.6.6-rc1v1.6.6-rc1Junio C Hamano2009-12-022-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.sh: Fix call to git-merge for new command formatHorst H. von Brand2009-12-021-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-023-12/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.6.6 before -rc1Junio C Hamano2009-12-011-20/+67
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-014-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/deprecate-old-syntax-from-merge'Junio C Hamano2009-12-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | git-merge: a deprecation notice of the ancient command line syntaxJunio C Hamano2009-12-011-0/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/remote-get-ref-states-fix'Junio C Hamano2009-12-011-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_ref_states: strdup entries and free util in stale listBert Wesarg2009-12-011-2/+4
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-blame'Junio C Hamano2009-12-016-88/+1173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Add link to other blame implementation in blame viewsJakub Narebski2009-12-011-0/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Make linking to actions requiring JavaScript a featureJakub Narebski2009-11-301-1/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb.js: fix padLeftStr() and its usageStephen Boyd2009-11-251-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb.js: Harden setting blamed commit info in incremental blameJakub Narebski2009-11-251-1/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb.js: fix null object exception in initials calculationStephen Boyd2009-11-191-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Minify gitweb.js if JSMIN is definedJakub Narebski2009-09-011-0/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Create links leading to 'blame_incremental' using JavaScriptJakub Narebski2009-09-012-9/+53
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Colorize 'blame_incremental' view during processingJakub Narebski2009-09-012-3/+110
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Incremental blame (using JavaScript)Jakub Narebski2009-09-016-88/+940
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitweb: Add optional "time to generate page" info in footerJakub Narebski2009-09-012-0/+36
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fc/maint-format-patch-pathspec-dashes'Junio C Hamano2009-11-302-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 'mm/maint-merge-ff-error-message-fix'Junio C Hamano2009-11-303-18/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy2009-11-291-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-292-13/+21
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/maint-merge-strategy-list-fix'Junio C Hamano2009-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | builtin-merge.c: call exclude_cmds() correctly.Avery Pennarun2009-11-291-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /