summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* notes merge: eliminate OUTPUT macrojn/maint-notes-avoid-va-argsJonathan Nieder2011-11-171-43/+61
* Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano2011-10-263-5/+12
|\
| * Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3Junio C Hamano2011-10-261-2/+5
| |\
| | * Documentation/git-update-index: refer to 'ls-files'Stefan Naewe2011-09-211-2/+5
| * | make the sample pre-commit hook script reject names with newlines, tooJim Meyering2011-10-261-2/+6
| * | Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy2011-10-231-1/+1
* | | completion: replace core.abbrevguard to core.abbrevNamhyung Kim2011-06-241-1/+1
* | | Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-264-14/+67
|\ \ \
| * | | test core.gitproxy configurationJeff King2011-05-181-0/+43
| * | | send-pack: avoid deadlock on git:// push with failed pack-objectsJeff King2011-05-161-0/+2
| * | | connect: let callers know if connection is a socketJeff King2011-05-162-1/+7
| * | | connect: treat generic proxy processes like ssh processesJeff King2011-05-161-13/+15
* | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4Junio C Hamano2011-05-261-2/+7
|\ \ \ \
| * \ \ \ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-161-2/+2
| |\ \ \ \ | | |/ / /
| | * | | sideband_demux(): fix decl-after-stmtJunio C Hamano2011-05-161-2/+2
| * | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-05-051-1/+2
| |\ \ \ \ | | |/ / /
| | * | | send-pack: unbreak push over stateless rpcJeff King2011-05-051-1/+2
| * | | | Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano2011-04-251-0/+4
| |\ \ \ \ | | |/ / /
| | * | | send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt2011-04-251-0/+4
* | | | | Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4Junio C Hamano2011-05-261-12/+11
|\ \ \ \ \
| * | | | | upload-pack: start pack-objects before async rev-listJeff King2011-04-061-12/+11
* | | | | | Git 1.7.4.5v1.7.4.5Junio C Hamano2011-04-193-2/+6
* | | | | | git-svn.txt: Document --mergeinfoMichael J Gruber2011-04-191-0/+7
* | | | | | archive: document limitation of tar.umask config settingRené Scharfe2011-04-141-1/+2
* | | | | | t3306,t5304: avoid clock skew issuesMichael J Gruber2011-04-142-1/+5
* | | | | | git.txt: fix list continuationMichael J Gruber2011-04-141-1/+0
* | | | | | Merge branch 'jc/rev-list-options-fix' into maintJunio C Hamano2011-04-131-2/+2
|\ \ \ \ \ \
| * | | | | | "log --cherry-pick" documentation regression fixJunio C Hamano2011-04-011-2/+2
* | | | | | | Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano2011-04-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t2021: mark a test as fixedJohannes Sixt2011-04-121-1/+1
* | | | | | | | Git 1.7.4.4v1.7.4.4Junio C Hamano2011-04-063-8/+6
* | | | | | | | Merge branch 'nm/maint-conflicted-submodule-entries' into maintJunio C Hamano2011-04-063-9/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin2011-03-303-9/+83
* | | | | | | | | Merge branch 'mg/rev-list-n-reverse-doc' into maintJunio C Hamano2011-04-062-161/+163
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | git-log.txt,rev-list-options.txt: put option blocks in proper orderMichael J Gruber2011-03-092-160/+160
| * | | | | | | git-log.txt,rev-list-options.txt: -n/--max-count is commit limitingMichael J Gruber2011-03-082-1/+3
* | | | | | | | Documentation: trivial grammar fix in core.worktree descriptionSZEDER Gábor2011-04-041-1/+1
* | | | | | | | gitweb: Fix parsing of negative fractional timezones in JavaScriptJakub Narebski2011-04-041-5/+19
* | | | | | | | Start preparing for 1.7.4.4Junio C Hamano2011-04-032-1/+38
* | | | | | | | pull: do not clobber untracked files on initial pullJeff King2011-04-032-1/+12
* | | | | | | | Merge branch 'jc/index-update-if-able' into maintJunio C Hamano2011-04-034-13/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | update $GIT_INDEX_FILE when there are racily clean entriesJunio C Hamano2011-03-211-1/+14
| * | | | | | | | diff/status: refactor opportunistic index updateJunio C Hamano2011-03-214-13/+16
* | | | | | | | | Merge branch 'lt/default-abbrev' into maintJunio C Hamano2011-04-035-3/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename core.abbrevlength back to core.abbrevJunio C Hamano2011-03-202-2/+2
| * | | | | | | | | Make the default abbrev length configurableLinus Torvalds2011-03-115-3/+23
* | | | | | | | | | Merge branch 'jc/maint-rev-list-culled-boundary' into maintJunio C Hamano2011-04-032-1/+33
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | list-objects.c: don't add an unparsed NULL as a pending treeJunio C Hamano2011-03-142-1/+33
* | | | | | | | | | | Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-035-1/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | log: fix --max-count when used together with -S or -GMatthieu Moy2011-03-095-1/+26