summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-05-26Git 1.7.5.3v1.7.5.3Junio C Hamano4-3/+36
2011-05-26Merge branch 'maint-1.7.4' into maintJunio C Hamano0-0/+0
2011-05-26Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4Junio C Hamano4-14/+67
2011-05-26Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maint-1.7.4Junio C Hamano1-2/+7
2011-05-26Merge branch 'jk/maint-upload-pack-shallow' into maint-1.7.4Junio C Hamano1-12/+11
2011-05-26Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2-2/+36
2011-05-26Merge branch 'kk/maint-prefix-in-config-mak' into maintJunio C Hamano1-9/+9
2011-05-26Merge branch 'mg/diff-uiconfig-doc' into maintJunio C Hamano2-12/+30
2011-05-26Merge branch 'ft/gitweb-tar-with-gzip-n' into maintJunio C Hamano1-1/+1
2011-05-26Merge branch 'ss/doc-svn' into maintJunio C Hamano1-9/+7
2011-05-26Merge branch 'jn/format-patch-doc' into maintJunio C Hamano4-195/+229
2011-05-26Merge branch 'jc/maint-pathspec-stdin-and-cmdline' into maintJunio C Hamano2-52/+45
2011-05-26Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano3-7/+36
2011-05-26Merge branch 'rg/copy-gecos-username' into maintJunio C Hamano1-0/+1
2011-05-26Merge branch 'fc/completion-zsh' into maintJunio C Hamano1-0/+8
2011-05-26Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano4-14/+67
2011-05-26Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano1-2/+7
2011-05-26Merge branch 'svn-fe-maint' of git://repo.or.cz/git/jrn into maintJunio C Hamano1-104/+2
2011-05-25init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy6-8/+6
2011-05-20do not read beyond end of malloc'd bufferJim Meyering2-2/+36
2011-05-20git-svn: Fix git svn log --show-commitMichael J Gruber2-1/+16
2011-05-19Git 1.7.5.2v1.7.5.2Junio C Hamano2-2/+3
2011-05-19provide a copy of the LGPLv2.1Jonathan Nieder1-0/+511
2011-05-18test core.gitproxy configurationJeff King1-0/+43
2011-05-17copy_gecos: fix not adding nlen to len when processing "&"Rafael Gieschke1-0/+1
2011-05-16Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano1-2/+2
2011-05-16Update draft release notes to 1.7.5.2Junio C Hamano1-0/+15
2011-05-16Merge branch 'jn/maint-format-patch-doc' into maintJunio C Hamano1-0/+58
2011-05-16Merge branch 'ss/cherry-pick-x-doc' into maintJunio C Hamano1-3/+4
2011-05-16Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2-14/+23
2011-05-16Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maintJunio C Hamano1-3/+3
2011-05-16Merge branch 'jc/t1506-shell-param-expansion-gotcha' into maintJunio C Hamano1-2/+5
2011-05-16Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2-39/+30
2011-05-16Merge branch 'jn/gitweb-dependency' into maintJunio C Hamano1-27/+1
2011-05-16Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2-15/+58
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano3-16/+54
2011-05-16Documentation/git-fsck.txt: fix typo: unreadable -> unreachableJim Meyering1-2/+2
2011-05-16send-pack: avoid deadlock on git:// push with failed pack-objectsJeff King1-0/+2
2011-05-16connect: let callers know if connection is a socketJeff King2-1/+7
2011-05-16connect: treat generic proxy processes like ssh processesJeff King1-13/+15
2011-05-16sideband_demux(): fix decl-after-stmtJunio C Hamano1-2/+2
2011-05-16t3503: test cherry picking and reverting root commitsJeff King1-2/+25
2011-05-16revert: allow reverting a root commitJeff King1-3/+1
2011-05-16cherry-pick: handle root commits with external strategiesJeff King1-2/+10
2011-05-15Update draft release notes to 1.7.5.2Junio C Hamano1-0/+9
2011-05-15Merge branch 'cn/format-patch-quiet' into maintJunio C Hamano2-7/+14
2011-05-15Merge branch 'jm/mergetool-submodules' into maintJunio C Hamano2-9/+371
2011-05-15Merge branch 'jk/format-patch-quote-special-in-from' into maintJunio C Hamano2-1/+102
2011-05-15Merge branch 'vh/git-svn-doc' into maintJunio C Hamano1-11/+11
2011-05-15git_open_noatime(): drop unused parameterJunio C Hamano1-8/+7
2011-05-15sha1_file: typofixJunio C Hamano1-1/+1
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder3-6/+6
2011-05-13Prepare for 1.7.5.2Junio C Hamano2-1/+34
2011-05-13Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2-2/+32
2011-05-13Merge branch 'js/blame-parsename' into maintJunio C Hamano3-3/+14
2011-05-13Merge branch 'gr/cvsimport-alternative-cvspass-location' into maintJunio C Hamano1-12/+41
2011-05-13Merge branch 'cj/p4merge' into maintJunio C Hamano1-6/+3
2011-05-13Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2-1/+106
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano16-36/+120
2011-05-13Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2-2/+67
2011-05-13t5400: Fix a couple of typosJohan Herland1-2/+2
2011-05-11Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'Junio C Hamano2-52/+45
2011-05-11Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'Junio C Hamano2-52/+45
2011-05-11setup_revisions(): take pathspec from command line and --stdin correctlyJunio C Hamano2-52/+45
2011-05-10git-completion: fix regression in zsh supportFelipe Contreras1-0/+8
2011-05-09Honor $(prefix) set in config.mak* when defining ETC_GIT*Johannes Sixt1-9/+9
2011-05-09Revert "Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconf...Junio C Hamano1-10/+9
2011-05-09t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano1-2/+5
2011-05-08t3701: add-p-fix makes the last test to passJunio C Hamano1-1/+1
2011-05-08Remove gitweb/gitweb.cgi and other legacy targets from main MakefileJakub Narebski1-26/+0
2011-05-08git-instaweb: Simplify build dependency on gitwebJakub Narebski1-1/+1
2011-05-06merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2-14/+57
2011-05-05Remove duplicated "is a"João Britto1-1/+1
2011-05-05fast-import: fix option parser for no-arg optionsSverre Rabbelier1-3/+3
2011-05-05Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano1-1/+2
2011-05-05send-pack: unbreak push over stateless rpcJeff King1-1/+2
2011-05-05t3701: fix here documentJunio C Hamano1-3/+2
2011-05-05git-fast-import.txt: --relative-marks takes no parameterMichael J Gruber1-2/+2
2011-05-05shell: add missing initialization of argv0_pathDima Sharov1-0/+2
2011-05-05t/annotate-tests: Use echo & cat instead of sedBrian Gernhardt1-1/+2
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-05-01Pass empty file to p4merge where no base is suitable.Ciaran Jessup1-6/+3
2011-05-01Look for password in both CVS and CVSNT password files.Guy Rouillier1-12/+41
2011-04-29merge-one-file: fix broken merges with alternate work treesJeff King2-3/+8
2011-04-29add tests for merge-index / merge-one-fileJeff King1-0/+100
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2-4/+7
2011-04-29add--interactive.perl: factor out repeated --recount optionJunio C Hamano1-8/+8
2011-04-29t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano1-0/+36
2011-04-29add -p: 'q' should really quitJunio C Hamano1-5/+4
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-29blame: tolerate bogus e-mail addresses a bit betterJosh Stone3-3/+13
2011-04-28Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdirKacper Kornet1-9/+10
2011-04-28git-rebase--interactive.sh: preserve-merges fails on merges created with no-ffAndrew Wong2-2/+32
2011-04-27config.txt,diff-options.txt: porcelain vs. plumbing for color.diffMichael J Gruber2-12/+30
2011-04-26pretty: quote rfc822 specials in email addressesJeff King2-1/+102
2011-04-26gitweb: supply '-n' to gzip for identical outputFraser Tweedale1-1/+1
2011-04-26git-svn.txt: small typeface improvementsValentin Haenel1-4/+4
2011-04-26git-svn.txt: move option descriptionsValentin Haenel1-11/+11
2011-04-26git-svn.txt: fix usage of --add-author-fromValentin Haenel1-1/+1
2011-04-26http: clear POSTFIELDS when initializing a slotJunio C Hamano1-0/+1
2011-04-25Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/ma...Junio C Hamano1-0/+4
2011-04-25send-pack: avoid deadlock when pack-object dies earlyJohannes Sixt1-0/+4
2011-04-23Git 1.7.5v1.7.5Junio C Hamano2-1/+6
2011-04-23Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2-39/+30
2011-04-23diff-files: show unmerged entries correctlyJunio C Hamano2-2/+95
2011-04-23diff: remove often unused parameters from diff_unmerge()Junio C Hamano3-11/+6
2011-04-23diff.c: return filepair from diff_unmerge()Junio C Hamano2-6/+9
2011-04-23test: use $_z40 from test-libJunio C Hamano12-22/+15
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-19remove noise and inaccuracies from git-svn docsStefan Sperling1-9/+7
2011-04-19Documentation/format-patch: suggest Toggle Word Wrap add-on for ThunderbirdJohannes Sixt1-4/+14
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-15doc: Clarify that "cherry-pick -x" does not use "git notes"Sebastian Schuberth1-3/+4
2011-04-15Documentation: publicize hints for sending patches with GMailJonathan Nieder4-55/+61
2011-04-15Documentation: publicize KMail hints for sending patches inlineJonathan Nieder2-20/+18
2011-04-15Documentation: hints for sending patches inline with ThunderbirdJonathan Nieder2-80/+84
2011-04-15Documentation: explain how to check for patch corruptionJonathan Nieder2-44/+60
2011-04-15Merge v1.7.5-rc2 into jn/format-patch-docJunio C Hamano431-4909/+12524
2011-04-15Documentation: describe the format of messages with inline patchesJonathan Nieder1-0/+58
2011-04-15Restructure documentation for git-merge-base.Jonathan Nieder1-12/+16
2011-04-15Documentation: update to git-merge-base --octopusVincent van Ravesteijn2-2/+7
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-13mergetool: Teach about submodulesJonathon Mah2-9/+371
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-12format-patch: document --quiet optionCarlos Martín Nieto1-1/+4
2011-04-12format-patch: don't pass on the --quiet flagCarlos Martín Nieto1-6/+10
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
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 16:46:42 +0000