summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git diff too slow for a fileRené Scharfe2010-05-027-11/+11
* index-pack: fix trivial typo in usage stringMichael J Gruber2010-05-011-1/+1
* git-submodule.sh: properly initialize shell variablesGerrit Pape2010-05-011-0/+2
* Documentation improvements for the description of short format.Eric Raymond2010-04-231-9/+34
* Git 1.7.0.6v1.7.0.6Junio C Hamano2010-04-224-3/+17
* Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maintJunio C Hamano2010-04-221-1/+1
|\
| * rev-list: use default abbrev length when abbrev-commit is in effectMichael J Gruber2010-03-241-1/+1
* | Merge branch 'wp/doc-filter-direction' into maintJunio C Hamano2010-04-221-4/+4
|\ \
| * | documentation: clarify direction of core.autocrlfWill Palmer2010-04-171-4/+4
* | | Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-221-9/+12
|\ \ \
| * | | diff: use large integers for diffstat calculationsJeff King2010-04-171-9/+12
* | | | Merge branch 'da/maint-python-startup' into maintJunio C Hamano2010-04-221-3/+2
|\ \ \ \
| * | | | Makefile: Remove usage of deprecated Python "has_key" methodDavid Aguilar2010-03-281-3/+2
* | | | | Documentation/Makefile: fix interrupted builds of user-manual.xmlJonathan Nieder2010-04-211-2/+6
* | | | | t7012: Mark missing tests as TODOMichael J Gruber2010-04-191-6/+6
* | | | | reflog: remove 'show' from 'expire's usage stringSZEDER Gábor2010-04-191-1/+1
* | | | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-04-191-0/+1
|\ \ \ \ \
| * | | | | MSVC: Fix build by adding missing termios.h dummyJohannes Sixt2010-04-191-0/+1
* | | | | | Documentation: Describe other situations where -z affects git diffCharles Bailey2010-04-181-2/+2
* | | | | | 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