summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge branch 'jk/format-patch-multiline-header' into maintJunio C Hamano2011-04-034-10/+121
|\ \ \ \ \
| * | | | | format-patch: rfc2047-encode newlines in headersJeff King2011-02-231-2/+2
| * | | | | format-patch: wrap long header linesJeff King2011-02-232-8/+108
| * | | | | strbuf: add fixed-length version of add_wrapped_textJeff King2011-02-232-0/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'jn/maint-instaweb-plack-fix' into maintJunio C Hamano2011-04-031-2/+4
|\ \ \ \ \
| * | | | | git-instaweb: Change how gitweb.psgi is made runnable as standalone appJakub Narebski2011-02-271-2/+4
* | | | | | Merge branch 'lp/config-vername-check' into maintJunio C Hamano2011-04-034-50/+111
|\ \ \ \ \ \
| * | | | | | Disallow empty section and variable namesLibor Pechacek2011-02-222-1/+10
| * | | | | | Sanity-check config variable namesLibor Pechacek2011-02-224-50/+102
* | | | | | | compat: add missing #include <sys/resource.h>Jonathan Nieder2011-04-031-0/+1
* | | | | | | Git 1.7.4.3v1.7.4.3Junio C Hamano2011-04-033-2/+34
* | | | | | | Doc: mention --delta-base-offset is the default for Porcelain commandsJunio C Hamano2011-04-021-1/+6
* | | | | | | Merge branch 'nd/index-doc' into maintJunio C Hamano2011-04-011-0/+185
|\ \ \ \ \ \ \
| * | | | | | | doc: technical details about the index file formatJunio C Hamano2011-03-231-37/+57
| * | | | | | | doc: technical details about the index file formatNguyễn Thái Ngọc Duy2011-02-271-0/+165
* | | | | | | | Merge branch 'pk/stash-apply-status-relative' into maintJunio C Hamano2011-04-012-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Add test: git stash shows status relative to current dirPiotr Krukowiecki2011-03-201-0/+19
| * | | | | | | | git stash: show status relative to current directoryPiotr Krukowiecki2011-03-141-1/+2
* | | | | | | | | Merge branch 'jc/maint-diff-q-filter' into maintJunio C Hamano2011-04-012-1/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff --quiet: disable optimization when --diff-filter=X is usedJunio C Hamano2011-03-162-1/+9
* | | | | | | | | | Merge branch 'js/maint-stash-index-copy' into maintJunio C Hamano2011-04-011-6/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: copy the index using --index-output instead of cp -pJohannes Sixt2011-03-171-6/+5
| * | | | | | | | | | stash: fix incorrect quoting in cleanup of temporary filesJohannes Sixt2011-03-171-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mg/doc-bisect-tweak-worktree' into maintJunio C Hamano2011-04-011-23/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-bisect.txt: example for bisecting with hot-fixMichael J Gruber2011-03-151-0/+33
| * | | | | | | | | | git-bisect.txt: streamline run presentationMichael J Gruber2011-03-151-26/+8
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jh/maint-do-not-track-non-branches' into maintJunio C Hamano2011-04-014-18/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-164-18/+39
* | | | | | | | | | | Merge branch 'fk/maint-cvsimport-early-failure' into maintJunio C Hamano2011-04-011-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-cvsimport.perl: Bail out right away when reading from the server failsFabian Keil2011-02-271-1/+3
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-011-2/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply -v: show offset count when patch did not apply exactlyJunio C Hamano2011-03-061-2/+14
* | | | | | | | | | | | Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-011-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | apply: do not patch lines that were already patchedJunio C Hamano2011-03-041-1/+6
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano2011-04-013-4/+62
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | do not overwrite untracked symlinksClemens Buchacher2011-02-212-4/+12
| * | | | | | | | | | | | Demonstrate breakage: checkout overwrites untracked symlink with directoryJohannes Sixt2011-02-151-0/+50
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |