summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-05-04Git 1.7.5.1v1.7.5.1Junio C Hamano3-2/+36
2011-05-04Merge branch 'jh/dirstat' into maintJunio C Hamano8-12/+81
2011-05-04Merge branch 'sp/maint-clear-postfields' into maintJunio C Hamano1-0/+1
2011-05-04Merge branch 'jk/maint-stash-oob' into maintJunio C Hamano2-16/+12
2011-05-04Merge branch 'jk/maint-upload-pack-shallow' into maintJunio C Hamano1-12/+11
2011-05-04Merge branch 'dm/stash-k-i-p' into maintJunio C Hamano3-4/+25
2011-05-04Merge branch 'jc/pack-objects-bigfile' into maintJunio C Hamano6-9/+14
2011-05-04Merge branch 'mg/reflog-with-options' into maintJunio C Hamano2-13/+35
2011-05-04Merge branch 'jk/stash-loosen-safety' into maintJunio C Hamano2-7/+17
2011-05-04Merge branch 'ar/clean-rmdir-empty' into maintJunio C Hamano2-1/+8
2011-05-04Merge branch 'mg/sha1-path-advise' into maintJunio C Hamano2-9/+19
2011-05-04git-add.txt: document 'add.ignoreErrors'Valentin Haenel1-0/+2
2011-04-29Start 1.7.5.1 maintenance trackJunio C Hamano2-1/+15
2011-04-29Merge branch 'mg/x-years-12-months' into maintJunio C Hamano2-2/+4
2011-04-29git-send-email: fix missing space in error messageSylvain Rabot1-1/+1
2011-04-26http: clear POSTFIELDS when initializing a slotJunio C Hamano1-0/+1
2011-04-23Git 1.7.5v1.7.5Junio C Hamano2-1/+6
2011-04-20date: avoid "X years, 12 months" in relative datesMichael J Gruber2-2/+4
2011-04-19Git 1.7.5-rc3v1.7.5-rc3Junio C Hamano3-9/+4
2011-04-19Sync with 1.7.4.5Junio C Hamano2-0/+11
2011-04-19Git 1.7.4.5v1.7.4.5Junio C Hamano3-2/+6
2011-04-19git-svn.txt: Document --mergeinfoMichael J Gruber1-0/+7
2011-04-18Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"Junio C Hamano1-11/+6
2011-04-14Merge branch 'maint'Junio C Hamano4-3/+7
2011-04-14archive: document limitation of tar.umask config settingRené Scharfe1-1/+2
2011-04-14t3306,t5304: avoid clock skew issuesMichael J Gruber2-1/+5
2011-04-14git.txt: fix list continuationMichael J Gruber1-1/+0
2011-04-13Git 1.7.5-rc2v1.7.5-rc2Junio C Hamano2-3/+3
2011-04-13Merge branch 'maint'Junio C Hamano0-0/+0
2011-04-13Merge branch 'jc/rev-list-options-fix' into maintJunio C Hamano1-2/+2
2011-04-13Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano1-1/+1
2011-04-13remove doubled words, e.g., s/to to/to/, and fix related typosJim Meyering8-14/+11
2011-04-13revert: Hide '-r' option in default usageRamkumar Ramachandra1-1/+2
2011-04-12--dirstat: In case of renames, use target filename instead of source filenameJohan Herland1-1/+1
2011-04-12Merge branch 'js/checkout-untracked-symlink'Junio C Hamano1-1/+1
2011-04-12Merge branch 'nd/init-gitdir'Junio C Hamano1-1/+1
2011-04-12t2021: mark a test as fixedJohannes Sixt1-1/+1
2011-04-11t0001: guard a new test with SYMLINKS prerequisiteJohannes Sixt1-1/+1
2011-04-11Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland4-5/+21
2011-04-11Makefile: extract Q_() source strings as ngettext()Ævar Arnfjörð Bjarmason1-1/+2
2011-04-11i18n: avoid parenthesized string as array initializerRamsay Jones1-1/+1
2011-04-11--dirstat-by-file: Make it faster and more correctJohan Herland3-5/+25
2011-04-11--dirstat: Describe non-obvious differences relative to --stat or regular diffJohan Herland6-7/+40
2011-04-11Merge git://git.bogomips.org/git-svnJunio C Hamano2-3/+31
2011-04-11Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2-23/+27
2011-04-09git-svn: Cache results of running the executable "git config"James Y Knight1-0/+5
2011-04-09git-svn: Add a svn-remote.<name>.pushurl config keyAlejandro R. Sedeño2-3/+26
2011-04-09gitk: Update cherry-pick error message parsingAnders Kaseorg1-1/+1
2011-04-07stash: ensure --no-keep-index and --patch can be used in any orderDan McGee2-5/+6
2011-04-07stash: add two more tests for --no-keep-indexDan McGee2-0/+20
2011-04-07git-p4: replace each tab with 8 spaces for consistencyAndrew Garber1-32/+32
2011-04-06upload-pack: start pack-objects before async rev-listJeff King1-12/+11
2011-04-06Git 1.7.5-rc1v1.7.5-rc1Junio C Hamano3-11/+14
2011-04-06Sync with 1.7.4.4Junio C Hamano1-6/+4
2011-04-06Git 1.7.4.4v1.7.4.4Junio C Hamano3-8/+6
2011-04-06Merge branch 'nm/maint-conflicted-submodule-entries' into maintJunio C Hamano3-9/+83
2011-04-06Merge branch 'mg/rev-list-n-reverse-doc' into maintJunio C Hamano2-161/+163
2011-04-06Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano3-19/+136
2011-04-06Merge branch 'mg/doc-revisions-txt'Junio C Hamano1-91/+107
2011-04-06stash: drop dirty worktree check on applyJeff King2-7/+17
2011-04-05Teach core.bigfilethreashold to pack-objectsJunio C Hamano6-9/+14
2011-04-05stash: fix false positive in the invalid ref test.Jon Seymour1-5/+5
2011-04-05stash: fix accidental apply of non-existent stashesJeff King2-11/+7
2011-04-04revisions.txt: language improvementsMichael J Gruber1-35/+35
2011-04-04Merge branch 'maint'Junio C Hamano2-6/+20
2011-04-04Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano13-37/+520
2011-04-04Merge branch 'jc/rev-list-options-fix'Junio C Hamano1-2/+2
2011-04-04Documentation: trivial grammar fix in core.worktree descriptionSZEDER Gábor1-1/+1
2011-04-04gitweb: Fix parsing of negative fractional timezones in JavaScriptJakub Narebski1-5/+19
2011-04-04Merge branch 'nm/maint-conflicted-submodule-entries'Junio C Hamano3-9/+83
2011-04-03Merge branch 'maint'Junio C Hamano2-0/+38
2011-04-03Start preparing for 1.7.4.4Junio C Hamano2-1/+38
2011-04-03pull: do not clobber untracked files on initial pullJeff King2-1/+12
2011-04-03Merge branch 'jc/index-update-if-able' into maintJunio C Hamano4-13/+29
2011-04-03Merge branch 'lt/default-abbrev' into maintJunio C Hamano5-3/+23
2011-04-03Merge branch 'jc/maint-rev-list-culled-boundary' into maintJunio C Hamano2-1/+33
2011-04-03Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano5-1/+26
2011-04-03Merge branch 'jk/format-patch-multiline-header' into maintJunio C Hamano4-10/+121
2011-04-03Merge branch 'jn/maint-instaweb-plack-fix' into maintJunio C Hamano1-2/+4
2011-04-03Merge branch 'lp/config-vername-check' into maintJunio C Hamano4-50/+111
2011-04-03sha1_name: Suggest commit:./file for path in subdirMichael J Gruber2-5/+8
2011-04-03t1506: factor out test for "Did you mean..."Michael J Gruber1-5/+12
2011-04-03compat: add missing #include <sys/resource.h>Jonathan Nieder1-0/+1
2011-04-03git.el: Don't use font-lock-compile-keywordsLawrence Mitchell1-3/+10
2011-04-03t2019-checkout-ambiguous-ref.sh: depend on C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason1-2/+2
2011-04-03Fix two unused variable warnings in gcc 4.6Dan McGee2-6/+1
2011-04-03Remove old binaries from .gitignoreDan McGee1-2/+0
2011-04-03sparse: Fix errors and silence warningsStephen Boyd7-9/+9
2011-04-03Update release notesJunio C Hamano2-23/+21
2011-04-03Sync with 1.7.4.3Junio C Hamano2-1/+38
2011-04-03Git 1.7.4.3v1.7.4.3Junio C Hamano3-2/+34
2011-04-02Doc: mention --delta-base-offset is the default for Porcelain commandsJunio C Hamano1-1/+6
2011-04-01Merge branch 'nd/init-gitdir'Junio C Hamano7-31/+176
2011-04-01Merge branch 'jc/merge-sans-branch'Junio C Hamano3-5/+58
2011-04-01Merge branch 'jr/grep-en-config'Junio C Hamano4-1/+52
2011-04-01Merge branch 'ab/i18n-st'Junio C Hamano59-875/+1009
2011-04-01Merge branch 'jk/pull-into-empty'Junio C Hamano4-2/+17
2011-04-01Merge branch 'sb/sparse-more'Junio C Hamano1-1/+1
2011-04-01Merge branch 'maint'Junio C Hamano1-1/+1
2011-04-01Merge branch 'nd/index-doc' into maintJunio C Hamano1-0/+185
2011-04-01Merge branch 'pk/stash-apply-status-relative' into maintJunio C Hamano2-1/+21
2011-04-01Merge branch 'jc/maint-diff-q-filter' into maintJunio C Hamano2-1/+9
2011-04-01Merge branch 'js/maint-stash-index-copy' into maintJunio C Hamano1-6/+5
2011-04-01Merge branch 'mg/doc-bisect-tweak-worktree' into maintJunio C Hamano1-23/+38
2011-04-01Merge branch 'jh/maint-do-not-track-non-branches' into maintJunio C Hamano4-18/+39
2011-04-01Merge branch 'fk/maint-cvsimport-early-failure' into maintJunio C Hamano1-1/+3
2011-04-01Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano1-2/+14
2011-04-01Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano1-1/+6
2011-04-01Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano3-4/+62
2011-04-01Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2-10/+72
2011-04-01"log --cherry-pick" documentation regression fixJunio C Hamano1-2/+2
2011-04-01revisions.txt: structure with a labelled listMichael J Gruber1-35/+51
2011-04-01revisions.txt: consistent use of quotesMichael J Gruber1-52/+52
2011-04-01reflog: fix overriding of command line optionsMichael J Gruber2-8/+3
2011-04-01t/t1411: test reflog with formatsMichael J Gruber1-0/+18
2011-04-01builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber1-6/+15
2011-04-01docs: fix filter-branch subdir example for exotic repo namesJeff King1-1/+1
2011-04-01clean: unreadable directory may still be rmdir-able if it is emptyAlex Riesen2-1/+8
2011-03-31Git 1.7.5-rc0v1.7.5-rc0Junio C Hamano2-2/+2
2011-03-30Merge branch 'maint'Junio C Hamano1-1/+1
2011-03-30parse-remote: typofixJunio C Hamano1-1/+1
2011-03-30submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin3-9/+83
2011-03-30Merge branch 'maint'Junio C Hamano7-53/+19
2011-03-30remote: deprecate --mirrorJeff King2-5/+7
2011-03-30remote: separate the concept of push and fetch mirrorsJeff King3-19/+129
2011-03-30remote: disallow some nonsensical option combinationsJeff King1-0/+5
2011-03-30grep: allow -E and -n to be turned on by default via configurationJoe Ratterman4-1/+52
2011-03-30contrib/thunderbird-patch-inline: do not require bash to run the scriptMaxin john1-2/+2
2011-03-30t8001: check the exit status of the command being testedJunio C Hamano1-5/+6
2011-03-30strbuf.h: remove a tad stale docs-in-comment and reference api-doc insteadMichael Witten1-36/+1
2011-03-30Typos: t/READMEMichael Witten1-5/+4
2011-03-30Documentation/config.txt: make truth value of numbers more explicitCarlos Martín Nieto1-1/+1
2011-03-30git-pack-objects.txt: fix grammatical errorsStephen Boyd1-3/+3
2011-03-30parse-remote: replace unnecessary sed invocationStephen Boyd1-1/+2
2011-03-30Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano3-9/+14
2011-03-29tests: kill backgrounded processes more robustlyJeff King1-6/+6
2011-03-29Merge branch 'maint'Junio C Hamano1-3/+3
2011-03-29Merge branch 'jc/fetch-progressive-stride'Junio C Hamano1-4/+5
2011-03-29Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-sto...Junio C Hamano2-4/+6
2011-03-29vcs-svn: a void function shouldn't try to return somethingMichael Witten1-1/+2
2011-03-29Revert two "no-done" revertsJunio C Hamano2-7/+31
2011-03-29enable "no-done" extension only when serving over smart-httpJunio C Hamano1-3/+4
2011-03-29Fix potential local deadlock during fetch-packJunio C Hamano1-4/+5
2011-03-29enable "no-done" extension only when fetching over smart-httpJunio C Hamano1-1/+2
2011-03-29HOME must be set before calling git-init when creating test repositoriesAlex Riesen1-3/+3
2011-03-29tests: make sure input to sed is newline terminatedJonathan Nieder1-2/+6
2011-03-28Revert "fetch-pack: Implement no-done capability"Junio C Hamano1-15/+3
2011-03-28Revert "upload-pack: Implement no-done capability"Junio C Hamano1-16/+4
2011-03-28Merge branch 'maint'Junio C Hamano3-19/+20
2011-03-28git tag documentation grammar fixes and readability updatesMichael Witten1-18/+18
2011-03-28tests: fix overeager scrubbing of environment variablesJens Lehmann1-1/+10
2011-03-28grep: Add the option '--line-number'Joe Ratterman2-1/+2
2011-03-28Improve test for pthreads flagGiuseppe Bilotta1-0/+2
2011-03-28vcs-svn: add missing cast to printf argumentJonathan Nieder1-1/+2
2011-03-27vcs-svn: add missing cast to printf argumentJonathan Nieder1-1/+2
2011-03-26Update draft release note to 1.7.5Junio C Hamano1-2/+15
2011-03-26Merge branch 'mg/rev-list-n-parents'Junio C Hamano9-22/+163
2011-03-26Merge branch 'js/remove-unused-variables'Junio C Hamano7-19/+5
2011-03-26Merge branch 'jp/completion-help-alias'Junio C Hamano1-1/+1
2011-03-26Merge branch 'jc/index-update-if-able'Junio C Hamano4-13/+29
2011-03-26Merge branch 'jk/checkout-orphan-warning'Junio C Hamano2-1/+64
2011-03-26Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano4-2/+86
2011-03-26Merge branch 'nd/index-doc'Junio C Hamano1-0/+185
2011-03-26Merge branch 'jc/fetch-progressive-stride'Junio C Hamano1-3/+18
2011-03-26Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano11-83/+156
2011-03-26Merge git-gui 0.14.0Junio C Hamano14-437/+3371
2011-03-26vcs-svn: handle log message with embedded NULJonathan Nieder6-13/+94
2011-03-26vcs-svn: avoid unnecessary copying of log message and authorJonathan Nieder1-10/+10
2011-03-26vcs-svn: remove buffer_read_stringJonathan Nieder5-48/+17
2011-03-26vcs-svn: make reading of properties binary-safeJonathan Nieder2-14/+37
2011-03-25Sync with 1.7.4.2Junio C Hamano2-2/+11
2011-03-25Git 1.7.4.2v1.7.4.2Junio C Hamano2-1/+8
2011-03-25pull: do not clobber untracked files on initial pullJeff King2-1/+12
2011-03-25merge: merge unborn index before setting refJeff King2-1/+5
2011-03-25t7607: clean up stray untracked fileJeff King1-1/+2
2011-03-25t7607: mark known breakage in test 11 as fixedJeff King1-1/+1
2011-03-25gitweb: Fix handling of fractional timezones in parse_dateJakub Narebski1-2/+4
2011-03-25Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0Pat Thoyts1-47/+54
2011-03-25git-gui: detect the use of MUI langauge packs on WindowsPat Thoyts1-0/+19
2011-03-24tests: avoid nonportable {foo,bar} globJonathan Nieder1-8/+8
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano3-4/+56
2011-03-24merge: match the help text with the documentationJared Hance1-2/+3
2011-03-23rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano4-2/+86
2011-03-23doc: technical details about the index file formatJunio C Hamano1-37/+57
2011-03-23Merge branch 'kc/gitweb-pathinfo-w-anchor'Junio C Hamano1-7/+20
2011-03-23Merge branch 'jn/fortify-source-workaround'Junio C Hamano1-6/+11
2011-03-23Merge branch 'jn/maint-c99-format'Junio C Hamano6-81/+26
2011-03-23Merge branch 'lt/default-abbrev'Junio C Hamano5-3/+23
2011-03-23Merge branch 'pk/stash-apply-status-relative'Junio C Hamano2-1/+21
2011-03-23Merge branch 'jc/maint-diff-q-filter'Junio C Hamano2-1/+9
2011-03-23Merge branch 'pw/p4'Junio C Hamano2-1/+26
2011-03-23rev-list --min-parents,--max-parents: doc, test and completionMichael J Gruber4-3/+129
2011-03-23revision.c: introduce --min-parents and --max-parents optionsMichael J Gruber5-10/+32
2011-03-22Update draft release notes to 1.7.5Junio C Hamano1-0/+27
2011-03-22Merge branch 'mg/rev-list-one-side-only'Junio C Hamano10-69/+230
2011-03-22Merge branch 'js/maint-stash-index-copy'Junio C Hamano1-6/+5
2011-03-22Merge branch 'tl/p4'Junio C Hamano1-10/+27
2011-03-22Merge branch 'mg/doc-bisect-tweak-worktree'Junio C Hamano1-23/+38
2011-03-22Merge branch 'jn/test-sanitize-git-env'Junio C Hamano8-47/+11
2011-03-22Merge branch 'sp/maint-upload-pack-stop-early'Junio C Hamano1-3/+24