summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch 'jk/maint-sha1-file-name-fix' into maintJunio C Hamano2010-06-211-13/+15
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-pull-dry-run-noop' into maintJunio C Hamano2010-06-211-1/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano2010-06-211-26/+35
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-213-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-214-35/+238
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/test-cleanup' into maintJunio C Hamano2010-06-215-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-217-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-212-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-06-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | gitweb/Makefile: fix typo in gitweb.min.css ruleJay Soffian2010-06-201-1/+1
* | | | | | | | | | | | | | | | | | | git-cvsserver: fix error for invalid password formatsÆvar Arnfjörð Bjarmason2010-06-201-1/+4
* | | | | | | | | | | | | | | | | | | git-cvsserver: typo in a comment: bas -> hasÆvar Arnfjörð Bjarmason2010-06-201-1/+1
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.7.2Junio C Hamano2010-06-181-4/+33
* | | | | | | | | | | | | | | | | | | Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano2010-06-183-5/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-063-6/+99
* | | | | | | | | | | | | | | | | | | | Merge branch 'by/diff-graph'Junio C Hamano2010-06-184-97/+342
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Make --color-words work well with --graphBo Yang2010-05-311-17/+104
| * | | | | | | | | | | | | | | | | | | | graph.c: register a callback for graph outputBo Yang2010-05-311-0/+19
| * | | | | | | | | | | | | | | | | | | | Emit a whole line in one goBo Yang2010-05-311-5/+27
| * | | | | | | | | | | | | | | | | | | | diff.c: Output the text graph padding before each diff lineBo Yang2010-05-311-53/+147
| * | | | | | | | | | | | | | | | | | | | Output the graph columns at the end of the commit messageBo Yang2010-05-311-0/+6
| * | | | | | | | | | | | | | | | | | | | Add a prefix output callback to diff outputBo Yang2010-05-312-27/+40
* | | | | | | | | | | | | | | | | | | | | Merge branch 'cb/ls-files-cdup'Junio C Hamano2010-06-184-71/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | ls-files: allow relative pathspecClemens Buchacher2010-06-052-42/+45
| * | | | | | | | | | | | | | | | | | | | | quote.c: separate quoting and relative path generationClemens Buchacher2010-06-052-29/+65
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/t9129-any-utf8'Junio C Hamano2010-06-181-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | t9129: fix UTF-8 locale detectionJunio C Hamano2010-06-021-7/+13
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/am-help'Junio C Hamano2010-06-181-10/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git am: Remove stray error message from sedRamkumar Ramachandra2010-06-021-1/+7
| * | | | | | | | | | | | | | | | | | | | | | | git am: Display some help text when patch is emptyRamkumar Ramachandra2010-06-021-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | git am: Set cmdline globallyRamkumar Ramachandra2010-06-021-9/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/rebase-cmdline-fix'Junio C Hamano2010-06-182-10/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | rebase: improve error message when upstream argument is missingJonathan Nieder2010-05-312-10/+20
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ps/gitweb--browse-chrome'Junio C Hamano2010-06-181-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-web--browse: Add support for google chrome and chromiumPavan Kumar Sunkara2010-05-311-2/+7
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/am-skip-hint'Junio C Hamano2010-06-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-am: suggest what to do with superfluous patchesJan Krüger2010-05-311-0/+2
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano2010-06-182-3/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland2010-05-312-3/+38
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ab/maint-perl-use-instlibdir'Junio C Hamano2010-06-181-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Makefile: remove redundant munging of @@INSTLIBDIR@@Ævar Arnfjörð Bjarmason2010-05-311-2/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ec/diff-noprefix-config'Junio C Hamano2010-06-182-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | diff: add configuration option for disabling diff prefixes.Eli Collins2010-05-182-1/+10
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/status-b'Junio C Hamano2010-06-185-8/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Documentation+t5708: document and test status -s -bMichael J Gruber2010-06-032-2/+55
| * | | | | | | | | | | | | | | | | | | | | | | | Show branch information in short output of git statusDaniel Knittl-Frank2010-06-033-6/+75
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/gitweb-plackup'Junio C Hamano2010-06-1811-105/+257
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | git-instaweb: Add support for running gitweb via 'plackup'Jakub Narebski2010-06-022-3/+158
| * | | | | | | | | | | | | | | | | | | | | | | | | git-instaweb: Wait for server to start before running web browserJakub Narebski2010-06-021-2/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | git-instaweb: Remove pidfile after stopping web serverJakub Narebski2010-06-021-0/+1