Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/conflict-marker-size' into maint | Junio C Hamano | 2010-04-09 | 2 | -14/+33 |
|\ | |||||
| * | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 | 2 | -14/+33 |
* | | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maint | Junio C Hamano | 2010-04-09 | 1 | -7/+11 |
|\ \ | |||||
| * | | http-backend: Don't infinite loop during die() | Shawn O. Pearce | 2010-03-24 | 1 | -7/+11 |
* | | | Merge branch 'mg/maint-send-email-lazy-editor' into maint | Junio C Hamano | 2010-04-09 | 1 | -1/+4 |
|\ \ \ | |||||
| * | | | send-email: lazily assign editor variable | Michael J Gruber | 2010-03-25 | 1 | -1/+4 |
* | | | | Merge branch 'rr/imap-send-unconfuse-from-line' into maint | Junio C Hamano | 2010-04-09 | 2 | -8/+10 |
|\ \ \ \ | |||||
| * | | | | imap-send: Remove limitation on message body | Ramkumar Ramachandra | 2010-03-24 | 2 | -8/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'rb/maint-python-path' into maint | Junio C Hamano | 2010-04-09 | 5 | -4/+9 |
|\ \ \ \ | |||||
| * | | | | Correct references to /usr/bin/python which does not exist on FreeBSD | R. Tyler Ballance | 2010-03-24 | 5 | -4/+9 |
| |/ / / | |||||
* | | | | Merge branch 'gh/maint-stash-show-error-message' into maint | Junio C Hamano | 2010-04-09 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | Improve error messages from 'git stash show' | Gustaf Hendeby | 2010-03-16 | 1 | -2/+6 |
* | | | | | Merge branch 'mg/mailmap-update' into maint | Junio C Hamano | 2010-04-09 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela | Michael J Gruber | 2010-03-20 | 1 | -0/+3 |
* | | | | | | Merge branch 'bc/maint-daemon-sans-ss-family' into maint | Junio C Hamano | 2010-04-09 | 1 | -4/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | daemon.c: avoid accessing ss_family member of struct sockaddr_storage | Brandon Casey | 2010-03-16 | 1 | -4/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | fetch/push: fix usage strings | Tay Ray Chuan | 2010-04-09 | 4 | -10/+10 |
* | | | | | | docs: clarify "branch -l" | Jeff King | 2010-04-08 | 1 | -0/+2 |
* | | | | | | pack-protocol.txt: fix pkt-line lengths | Tay Ray Chuan | 2010-04-04 | 1 | -4/+4 |
* | | | | | | pack-protocol.txt: fix spelling | Tay Ray Chuan | 2010-04-04 | 1 | -1/+1 |
* | | | | | | Git 1.7.0.4v1.7.0.4 | Junio C Hamano | 2010-03-31 | 3 | -4/+13 |
* | | | | | | Merge branch 'jc/maint-refs-dangling' into maint | Junio C Hamano | 2010-03-31 | 2 | -7/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | refs: ref entry with NULL sha1 is can be a dangling symref | Junio C Hamano | 2010-03-15 | 2 | -7/+10 |
* | | | | | | | Documentation: show-ref <pattern>s are optional | Holger Weiß | 2010-03-31 | 1 | -1/+1 |
* | | | | | | | Link against libiconv on IRIX | Holger Weiß | 2010-03-31 | 1 | -0/+2 |
* | | | | | | | Don't redefine htonl and ntohl on big-endian | Holger Weiß | 2010-03-31 | 1 | -0/+2 |
* | | | | | | | gitweb: git_get_project_config requires only $git_dir, not also $project | Jakub Narebski | 2010-03-31 | 1 | -2/+1 |
* | | | | | | | Updated the usage string of git reset | Jan Stępień | 2010-03-31 | 1 | -1/+2 |
* | | | | | | | Documentation: Clarify support for smart HTTP backend | Greg Bacon | 2010-03-30 | 1 | -1/+1 |
* | | | | | | | Windows: fix utime() for read-only files | Johannes Sixt | 2010-03-30 | 1 | -2/+18 |
* | | | | | | | diff: fix textconv error zombies | Johannes Sixt | 2010-03-30 | 1 | -6/+11 |
* | | | | | | | format-patch: Squelch 'fatal: Not a range." error | Kevin Ballard | 2010-03-29 | 2 | -1/+12 |
* | | | | | | | Prepare for 1.7.0.4 | Junio C Hamano | 2010-03-28 | 2 | -1/+20 |
* | | | | | | | Merge branch 'cp/add-u-pathspec' into maint | Junio C Hamano | 2010-03-28 | 3 | -9/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | test for add with non-existent pathspec | Chris Packham | 2010-02-16 | 2 | -0/+10 |
| * | | | | | | | git add -u: die on unmatched pathspec | Junio C Hamano | 2010-02-16 | 1 | -9/+29 |
* | | | | | | | | t9350: fix careless use of "cd" | Junio C Hamano | 2010-03-28 | 1 | -33/+38 |
* | | | | | | | | difftool: Fix '--gui' when diff.guitool is unconfigured | David Aguilar | 2010-03-28 | 2 | -5/+16 |
* | | | | | | | | fast-export: don't segfault when marks file cannot be opened | Sverre Rabbelier | 2010-03-28 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jc/color-attrs' into maint | Junio C Hamano | 2010-03-24 | 3 | -14/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | color: allow multiple attributes | Junio C Hamano | 2010-03-07 | 3 | -14/+41 |
* | | | | | | | | | Merge branch 'jk/maint-add-ignored-dir' into maint | Junio C Hamano | 2010-03-24 | 3 | -4/+103 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tests for "git add ignored-dir/file" without -f | Junio C Hamano | 2010-03-13 | 1 | -0/+79 |
| * | | | | | | | | | dir: fix COLLECT_IGNORED on excluded prefixes | Jeff King | 2010-03-13 | 1 | -2/+18 |
| * | | | | | | | | | t0050: mark non-working test as such | Junio C Hamano | 2010-03-13 | 1 | -2/+6 |
* | | | | | | | | | | Merge branch 'bg/apply-fix-blank-at-eof' into maint | Junio C Hamano | 2010-03-24 | 4 | -40/+450 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3417: Add test cases for "rebase --whitespace=fix" | Björn Gustavsson | 2010-03-06 | 1 | -0/+126 |
| * | | | | | | | | | | t4124: Add additional tests of --whitespace=fix | Björn Gustavsson | 2010-03-06 | 1 | -0/+170 |
| * | | | | | | | | | | apply: Allow blank context lines to match beyond EOF | Björn Gustavsson | 2010-03-06 | 1 | -30/+138 |
| * | | | | | | | | | | apply: Remove the quick rejection test | Björn Gustavsson | 2010-03-06 | 2 | -5/+16 |