summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix various sparse warnings in the git source codeLinus Torvalds2009-06-2023-42/+42
* Merge branch 'ph/submodule-rebase'Junio C Hamano2009-06-204-6/+86
|\
| * git-submodule: add support for --merge.Johan Herland2009-06-034-6/+86
* | Merge branch 'jc/cache-tree'Junio C Hamano2009-06-207-44/+117
|\ \
| * | Avoid "diff-index --cached" optimization under --find-copies-harderJunio C Hamano2009-05-252-2/+8
| * | Optimize "diff-index --cached" using cache-treeJunio C Hamano2009-05-255-0/+55
| * | t4007: modernize the styleJunio C Hamano2009-05-251-37/+32
| * | cache-tree.c::cache_tree_find(): simplify internal APIJunio C Hamano2009-05-251-0/+2
| * | write-tree --ignore-cache-treeJunio C Hamano2009-05-203-7/+22
* | | Merge branch 'mg/pushurl'Junio C Hamano2009-06-209-17/+102
|\ \ \
| * | | avoid NULL dereference on failed mallocJim Meyering2009-06-141-2/+2
| * | | builtin-remote: Make "remote -v" display push urlsMichael J Gruber2009-06-131-5/+26
| * | | builtin-remote: Show push urls as wellMichael J Gruber2009-06-132-8/+22
| * | | technical/api-remote: Describe new struct remote member pushurlMichael J Gruber2009-06-091-0/+4
| * | | t5516: Check pushurl config settingMichael J Gruber2009-06-091-0/+13
| * | | Allow push and fetch urls to be differentMichael J Gruber2009-06-095-4/+37
* | | | Merge branch 'mn/maint-iconv-autoconf'Junio C Hamano2009-06-201-0/+8
|\ \ \ \
| * | | | fix handling of iconv configuration optionsMarco Nelissen2009-06-081-0/+8
* | | | | Merge branch 'sb/pull-rebase'Junio C Hamano2009-06-204-221/+43
|\ \ \ \ \
| * | | | | parse-remote: remove unused functionsSanti Béjar2009-06-112-224/+0
| * | | | | parse-remote: support default reflist in get_remote_merge_branchSanti Béjar2009-06-112-1/+21
| * | | | | parse-remote: function to get the tracking branch to be mergeSanti Béjar2009-06-112-5/+31
* | | | | | Merge branch 'pb/send-email-cccmd-fix'Junio C Hamano2009-06-204-10/+80
|\ \ \ \ \ \
| * | | | | | Test cccmd in t9001-send-email.sh and fix some bugsPaolo Bonzini2009-06-184-10/+80
* | | | | | | Merge branch 'pb/maint-1.6.2-userdiff-fix'Junio C Hamano2009-06-202-7/+10
|\ \ \ \ \ \ \
| * | | | | | | upload-archive: fix infinite loop on CygwinRené Scharfe2009-06-181-5/+7
| * | | | | | | avoid exponential regex match for java and objc function namesPaolo Bonzini2009-06-181-2/+3
* | | | | | | | Merge branch 'sb/maint-1.6.0-add-config-fix'Junio C Hamano2009-06-203-6/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | add: allow configurations to be overriden by command lineStephen Boyd2009-06-182-2/+15
| * | | | | | | | use xstrdup, not strdup in ll-merge.cJim Meyering2009-06-141-4/+4
* | | | | | | | | Merge branch 'lt/maint-unsigned-left-shift'Junio C Hamano2009-06-208-16/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix big left-shifts of unsigned charLinus Torvalds2009-06-188-16/+12
* | | | | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2009-06-202-348/+479
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gitk: Allow diff view without context linesMarkus Heidelberg2009-05-251-2/+2
| * | | | | | | | | | gitk: Add another string to translationMichele Ballabio2009-05-251-1/+1
| * | | | | | | | | | gitk: Add option 'Simple history' to the options menuDirk Suesserott2009-05-251-1/+3
| * | | | | | | | | | gitk: Handle msysGit version during version comparisonsPat Thoyts2009-05-191-1/+1
| * | | | | | | | | | gitk: Make more options easily accessible from Edit View dialogElijah Newren2009-05-161-37/+94
| * | | | | | | | | | gitk: Check git version before using --textconv flagPaul Mackerras2009-05-161-1/+7
| * | | | | | | | | | gitk: Use --textconv to generate diff textJohannes Sixt2009-05-161-1/+1
| * | | | | | | | | | gitk: Update German translation.Christian Stimming2009-05-161-307/+373
* | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-06-184-19/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http.c: fix compiling with libcurl 7.9.2Mark Lodato2009-06-181-4/+4
| * | | | | | | | | | | import-tars: support symlinksJohannes Schindelin2009-06-181-5/+12
| * | | | | | | | | | | pull, rebase: simplify to use die()Stephen Boyd2009-06-142-10/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/parse-options-integer'Junio C Hamano2009-06-184-48/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | parse-options: simplify usage argh handlingStephen Boyd2009-06-063-38/+21
| * | | | | | | | | | | parse-options: make OPT_INTEGER's argh explicitStephen Boyd2009-06-063-12/+5
* | | | | | | | | | | | Merge branch 'ak/maint-for-each-ref-no-lookup'Junio C Hamano2009-06-181-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | for-each-ref: Do not lookup objects when they will not be usedAnders Kaseorg2009-05-281-9/+17