summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS worki...Alex Bennée2009-06-182-3/+26
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'maint'Junio C Hamano2009-06-131-33/+32
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-06-131-33/+32
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-06-131-33/+32
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-06-132-34/+34
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | git-rerere.txt: grammatical fixups and cleanupsStephen Boyd2009-06-131-33/+32
* | | | | | | | Merge branch 'mh/fix-send-email-threaded'Junio C Hamano2009-06-133-4/+27
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threadedJunio C Hamano2009-06-123-3/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | doc/send-email: clarify the behavior of --in-reply-to with --no-threadMarkus Heidelberg2009-06-121-2/+3
| | * | | | | | | | send-email: fix non-threaded mailsMarkus Heidelberg2009-06-122-2/+3
| | * | | | | | | | add a test for git-send-email for non-threaded mailsMarkus Heidelberg2009-06-121-0/+10
| | |/ / / / / / /
| * | | | | | | | send-email: fix a typo in a commentMarkus Heidelberg2009-06-121-1/+1
| * | | | | | | | send-email: fix threaded mails without chain-reply-toMarkus Heidelberg2009-06-122-2/+3
| * | | | | | | | add a test for git-send-email for threaded mails without chain-reply-toMarkus Heidelberg2009-06-121-0/+11
* | | | | | | | | Merge branch 'rc/http-push'Junio C Hamano2009-06-138-993/+904
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http*: add helper methods for fetching objects (loose)Tay Ray Chuan2009-06-064-431/+336
| * | | | | | | | | http*: add helper methods for fetching packsTay Ray Chuan2009-06-064-151/+167
| * | | | | | | | | http: use new http API in fetch_index()Tay Ray Chuan2009-06-061-73/+8
| * | | | | | | | | http*: add http_get_info_packsTay Ray Chuan2009-06-064-345/+186
| * | | | | | | | | http-push.c::fetch_symref(): use the new http APIMike Hommey2009-06-061-17/+3
| * | | | | | | | | http-push.c::remote_exists(): use the new http APIMike Hommey2009-06-061-19/+12
| * | | | | | | | | http.c::http_fetch_ref(): use the new http APIMike Hommey2009-06-061-25/+8