Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pb/send-email-cccmd-fix' | Junio C Hamano | 2009-06-20 | 4 | -10/+80 |
|\ | |||||
| * | Test cccmd in t9001-send-email.sh and fix some bugs | Paolo Bonzini | 2009-06-18 | 4 | -10/+80 |
* | | Merge branch 'pb/maint-1.6.2-userdiff-fix' | Junio C Hamano | 2009-06-20 | 2 | -7/+10 |
|\ \ | |||||
| * | | upload-archive: fix infinite loop on Cygwin | René Scharfe | 2009-06-18 | 1 | -5/+7 |
| * | | avoid exponential regex match for java and objc function names | Paolo Bonzini | 2009-06-18 | 1 | -2/+3 |
* | | | Merge branch 'sb/maint-1.6.0-add-config-fix' | Junio C Hamano | 2009-06-20 | 3 | -6/+19 |
|\ \ \ | |||||
| * | | | add: allow configurations to be overriden by command line | Stephen Boyd | 2009-06-18 | 2 | -2/+15 |
| * | | | use xstrdup, not strdup in ll-merge.c | Jim Meyering | 2009-06-14 | 1 | -4/+4 |
* | | | | Merge branch 'lt/maint-unsigned-left-shift' | Junio C Hamano | 2009-06-20 | 8 | -16/+12 |
|\ \ \ \ | |||||
| * | | | | Fix big left-shifts of unsigned char | Linus Torvalds | 2009-06-18 | 8 | -16/+12 |
* | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitk | Junio C Hamano | 2009-06-20 | 2 | -348/+479 |
|\ \ \ \ \ | |||||
| * | | | | | gitk: Allow diff view without context lines | Markus Heidelberg | 2009-05-25 | 1 | -2/+2 |
| * | | | | | gitk: Add another string to translation | Michele Ballabio | 2009-05-25 | 1 | -1/+1 |
| * | | | | | gitk: Add option 'Simple history' to the options menu | Dirk Suesserott | 2009-05-25 | 1 | -1/+3 |
| * | | | | | gitk: Handle msysGit version during version comparisons | Pat Thoyts | 2009-05-19 | 1 | -1/+1 |
| * | | | | | gitk: Make more options easily accessible from Edit View dialog | Elijah Newren | 2009-05-16 | 1 | -37/+94 |
| * | | | | | gitk: Check git version before using --textconv flag | Paul Mackerras | 2009-05-16 | 1 | -1/+7 |
| * | | | | | gitk: Use --textconv to generate diff text | Johannes Sixt | 2009-05-16 | 1 | -1/+1 |
| * | | | | | gitk: Update German translation. | Christian Stimming | 2009-05-16 | 1 | -307/+373 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-18 | 4 | -19/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | http.c: fix compiling with libcurl 7.9.2 | Mark Lodato | 2009-06-18 | 1 | -4/+4 |
| * | | | | | | import-tars: support symlinks | Johannes Schindelin | 2009-06-18 | 1 | -5/+12 |
| * | | | | | | pull, rebase: simplify to use die() | Stephen Boyd | 2009-06-14 | 2 | -10/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/parse-options-integer' | Junio C Hamano | 2009-06-18 | 4 | -48/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | parse-options: simplify usage argh handling | Stephen Boyd | 2009-06-06 | 3 | -38/+21 |
| * | | | | | | parse-options: make OPT_INTEGER's argh explicit | Stephen Boyd | 2009-06-06 | 3 | -12/+5 |
* | | | | | | | Merge branch 'ak/maint-for-each-ref-no-lookup' | Junio C Hamano | 2009-06-18 | 1 | -9/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | for-each-ref: Do not lookup objects when they will not be used | Anders Kaseorg | 2009-05-28 | 1 | -9/+17 |
* | | | | | | | | Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS worki... | Alex Bennée | 2009-06-18 | 2 | -3/+26 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Merge branch 'maint-1.6.2' into maint | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2009-06-13 | 1 | -33/+32 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-06-13 | 2 | -34/+34 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | git-rerere.txt: grammatical fixups and cleanups | Stephen Boyd | 2009-06-13 | 1 | -33/+32 |
* | | | | | | | | Merge branch 'mh/fix-send-email-threaded' | Junio C Hamano | 2009-06-13 | 3 | -4/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded | Junio C Hamano | 2009-06-12 | 3 | -3/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | doc/send-email: clarify the behavior of --in-reply-to with --no-thread | Markus Heidelberg | 2009-06-12 | 1 | -2/+3 |
| | * | | | | | | | | send-email: fix non-threaded mails | Markus Heidelberg | 2009-06-12 | 2 | -2/+3 |
| | * | | | | | | | | add a test for git-send-email for non-threaded mails | Markus Heidelberg | 2009-06-12 | 1 | -0/+10 |
| | |/ / / / / / / | |||||
| * | | | | | | | | send-email: fix a typo in a comment | Markus Heidelberg | 2009-06-12 | 1 | -1/+1 |
| * | | | | | | | | send-email: fix threaded mails without chain-reply-to | Markus Heidelberg | 2009-06-12 | 2 | -2/+3 |
| * | | | | | | | | add a test for git-send-email for threaded mails without chain-reply-to | Markus Heidelberg | 2009-06-12 | 1 | -0/+11 |
* | | | | | | | | | Merge branch 'rc/http-push' | Junio C Hamano | 2009-06-13 | 8 | -993/+904 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | http*: add helper methods for fetching objects (loose) | Tay Ray Chuan | 2009-06-06 | 4 | -431/+336 |
| * | | | | | | | | | http*: add helper methods for fetching packs | Tay Ray Chuan | 2009-06-06 | 4 | -151/+167 |
| * | | | | | | | | | http: use new http API in fetch_index() | Tay Ray Chuan | 2009-06-06 | 1 | -73/+8 |
| * | | | | | | | | | http*: add http_get_info_packs | Tay Ray Chuan | 2009-06-06 | 4 | -345/+186 |
| * | | | | | | | | | http-push.c::fetch_symref(): use the new http API | Mike Hommey | 2009-06-06 | 1 | -17/+3 |
| * | | | | | | | | | http-push.c::remote_exists(): use the new http API | Mike Hommey | 2009-06-06 | 1 | -19/+12 |
| * | | | | | | | | | http.c::http_fetch_ref(): use the new http API | Mike Hommey | 2009-06-06 | 1 | -25/+8 |