summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* stash: Don't overwrite files that have gone from the indexCharles Bailey2010-04-181-1/+1
* t1010-mktree: Adjust expected result to code and documentationMichael J Gruber2010-04-171-6/+4
* combined diff: correctly handle truncated fileThomas Rast2010-04-172-6/+16
* Document new "already-merged" rule for branch -dJonathan Nieder2010-04-151-1/+3
* Documentation/config.txt: default gc.aggressiveWindow is 250, not 10Jay Soffian2010-04-131-1/+1
* Docs: Add -X option to git-merge's synopsis.Marc Branchaud2010-04-122-6/+7
* Git 1.7.0.5v1.7.0.5Junio C Hamano2010-04-114-3/+30
* Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maintJunio C Hamano2010-04-111-1/+1
|\
| * branch: say "Reset to" in reflog entries for 'git branch -f' operationsTay Ray Chuan2010-04-091-1/+1
* | blame documentation: -M/-C notice copied lines as well as moved onesJunio C Hamano2010-04-111-9/+10
* | Let check_preimage() use memset() to initialize "struct checkout"Jens Lehmann2010-04-091-4/+1
* | Merge branch 'ef/maint-empty-commit-log' into maintJunio C Hamano2010-04-092-1/+13
|\ \
| * | rev-list: fix --pretty=oneline with empty messageErik Faye-Lund2010-03-212-1/+13
* | | Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-092-14/+33
|\ \ \
| * | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-242-14/+33
* | | | Merge branch 'sp/maint-http-backend-die-triggers-die-recursively' into maintJunio C Hamano2010-04-091-7/+11
|\ \ \ \
| * | | | http-backend: Don't infinite loop during die()Shawn O. Pearce2010-03-241-7/+11
* | | | | Merge branch 'mg/maint-send-email-lazy-editor' into maintJunio C Hamano2010-04-091-1/+4
|\ \ \ \ \
| * | | | | send-email: lazily assign editor variableMichael J Gruber2010-03-251-1/+4
* | | | | | Merge branch 'rr/imap-send-unconfuse-from-line' into maintJunio C Hamano2010-04-092-8/+10
|\ \ \ \ \ \
| * | | | | | imap-send: Remove limitation on message bodyRamkumar Ramachandra2010-03-242-8/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rb/maint-python-path' into maintJunio C Hamano2010-04-095-4/+9
|\ \ \ \ \ \
| * | | | | | Correct references to /usr/bin/python which does not exist on FreeBSDR. Tyler Ballance2010-03-245-4/+9
| |/ / / / /
* | | | | | Merge branch 'gh/maint-stash-show-error-message' into maintJunio C Hamano2010-04-091-2/+6
|\ \ \ \ \ \
| * | | | | | Improve error messages from 'git stash show'Gustaf Hendeby2010-03-161-2/+6
* | | | | | | Merge branch 'mg/mailmap-update' into maintJunio C Hamano2010-04-091-0/+3
|\ \ \ \ \ \ \
| * | | | | | | .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber2010-03-201-0/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'bc/maint-daemon-sans-ss-family' into maintJunio C Hamano2010-04-091-4/+7
|\ \ \ \ \ \ \
| * | | | | | | daemon.c: avoid accessing ss_family member of struct sockaddr_storageBrandon Casey2010-03-161-4/+7
| | |/ / / / / | |/| | | | |
* | | | | | | fetch/push: fix usage stringsTay Ray Chuan2010-04-094-10/+10
* | | | | | | docs: clarify "branch -l"Jeff King2010-04-081-0/+2
* | | | | | | pack-protocol.txt: fix pkt-line lengthsTay Ray Chuan2010-04-041-4/+4
* | | | | | | pack-protocol.txt: fix spellingTay Ray Chuan2010-04-041-1/+1
* | | | | | | Git 1.7.0.4v1.7.0.4Junio C Hamano2010-03-313-4/+13
* | | | | | | Merge branch 'jc/maint-refs-dangling' into maintJunio C Hamano2010-03-312-7/+10
|\ \ \ \ \ \ \
| * | | | | | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-152-7/+10
* | | | | | | | Documentation: show-ref <pattern>s are optionalHolger Weiß2010-03-311-1/+1
* | | | | | | | Link against libiconv on IRIXHolger Weiß2010-03-311-0/+2
* | | | | | | | Don't redefine htonl and ntohl on big-endianHolger Weiß2010-03-311-0/+2
* | | | | | | | gitweb: git_get_project_config requires only $git_dir, not also $projectJakub Narebski2010-03-311-2/+1
* | | | | | | | Updated the usage string of git resetJan Stępień2010-03-311-1/+2
* | | | | | | | Documentation: Clarify support for smart HTTP backendGreg Bacon2010-03-301-1/+1
* | | | | | | | Windows: fix utime() for read-only filesJohannes Sixt2010-03-301-2/+18
* | | | | | | | diff: fix textconv error zombiesJohannes Sixt2010-03-301-6/+11
* | | | | | | | format-patch: Squelch 'fatal: Not a range." errorKevin Ballard2010-03-292-1/+12
* | | | | | | | Prepare for 1.7.0.4Junio C Hamano2010-03-282-1/+20
* | | | | | | | Merge branch 'cp/add-u-pathspec' into maintJunio C Hamano2010-03-283-9/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | test for add with non-existent pathspecChris Packham2010-02-162-0/+10
| * | | | | | | | git add -u: die on unmatched pathspecJunio C Hamano2010-02-161-9/+29
* | | | | | | | | t9350: fix careless use of "cd"Junio C Hamano2010-03-281-33/+38
View Lorry Controller Status