summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2005-12-03GIT 0.99.9l aka 1.0rc4v1.0rc4v0.99.9lJunio C Hamano90-749/+1507
2005-12-03[PATCH] daemon.c and path.enter_repo(): revamp path validation.Junio C Hamano2-58/+159
2005-12-03A few more options for git-cat-fileH. Peter Anvin2-18/+42
2005-12-03Add compat/setenv.c, use in git.c.Jason Riedy3-9/+53
2005-12-03New test case: Criss-cross mergeFredrik Kuivinen1-0/+92
2005-12-03New test case: merge with directory/file conflictsFredrik Kuivinen1-0/+25
2005-12-03test-lib.sh: Add new function, test_expect_codeFredrik Kuivinen1-0/+13
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen1-1/+2
2005-12-02documentation: git-tagNo name1-1/+21
2005-12-02documentation: git-bisect (help HTML break man)Junio C Hamano1-7/+7
2005-12-02documentation: clarify read-tree --resetNo name1-4/+6
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano1-4/+6
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano1-0/+8
2005-12-02merge-one-file: make sure we create the merged file.Junio C Hamano1-1/+7
2005-12-01t3100: add ls-tree -t and -d tests.Junio C Hamano1-0/+38
2005-12-01merge-recursive: adjust git-ls-tree use for the latest.Junio C Hamano1-1/+1
2005-12-01git wrapper: more careful argument stuffingAlex Riesen1-7/+12
2005-12-01git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano1-1/+1
2005-12-01ls-tree: --name-onlyJunio C Hamano1-2/+11
2005-12-01ls-tree: resurrect '-d' to mean 'show trees only'Junio C Hamano1-0/+6
2005-12-01git-ls-tree: add "-t" option to always show the tree entriesLinus Torvalds1-24/+41
2005-12-01Makefile: say the default target upfront.Junio C Hamano1-0/+3
2005-12-01Documentation: describe '-f' option to git-fetch.Junio C Hamano1-0/+5
2005-11-30Move couple of ifdefs after "include config.mk"Timo Hirvonen1-16/+12
2005-11-30Merge branch 'jc/subdir'Junio C Hamano38-20/+168
2005-11-30Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect' and 'lt/merge'Junio C Hamano16-320/+215
2005-11-30Do not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".Tommi Virtanen1-1/+1
2005-11-30Tutorial: adjust merge example to recursive strategy.Junio C Hamano1-8/+7
2005-11-30merge-recursive: match the unmerged index entry behaviour with merge-resolveJunio C Hamano1-2/+0
2005-11-30diff-files: show diffs with stage0 and unmerged stage at the same time.Junio C Hamano2-23/+5
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds1-5/+1
2005-11-30diff-files: -1/-2/-3 to diff against unmerged stage.Linus Torvalds2-8/+64
2005-11-29git-diff: do not turn off -p/-M with any diff options.Junio C Hamano1-2/+15
2005-11-29Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-54/+88
2005-11-29[PATCH] Add tests for git-mv in subdirectoriesAlex Riesen1-0/+27
2005-11-29[PATCH] Make git-mv work in subdirectories, tooJohannes Schindelin1-9/+3
2005-11-30gitk: Add a preferences dialog with some basic stuffPaul Mackerras1-54/+88
2005-11-29format-patch: run diff in C localeJunio C Hamano1-1/+5
2005-11-29format-patch: do not abuse 3-dash marker line.Junio C Hamano1-1/+1
2005-11-29format-patch: remove applies-to.Junio C Hamano1-1/+0
2005-11-29applypatch: use "index" lines not "applies-to".Junio C Hamano1-13/+24
2005-11-29applymbox: typofix to enable -m option.Junio C Hamano1-1/+1
2005-11-29SVN import: Use one log callMatthias Urlichs2-29/+21
2005-11-29Fix typos and minor format issues.jdl@freescale.com1-7/+7
2005-11-29http-push cleanupNick Hengeveld1-2/+3
2005-11-28git-clone --shared should imply --localPavel Roskin1-1/+1
2005-11-28hash-object.c: type-fix to squelch compiler warnings.Junio C Hamano1-2/+2
2005-11-28define die() for scripts that use it.Junio C Hamano6-0/+30
2005-11-28verify-tag: make it operable from a subdirectory.Junio C Hamano1-4/+8
2005-11-28tag: make it operable from a subdirectory.Junio C Hamano1-1/+1
2005-11-28lost-found: make it operable from a subdirectory.Junio C Hamano1-2/+1
2005-11-28branch: make it operable from a subdirectory.Junio C Hamano1-4/+2
2005-11-28ls-remote: define die() now we do not use git-sh-setupJunio C Hamano1-0/+5
2005-11-28count-objects: make it operable from a subdirectory.Junio C Hamano1-1/+1
2005-11-28Make the rest of commands work from a subdirectory.Junio C Hamano14-1/+29
2005-11-28Make networking commands to work from a subdirectory.Junio C Hamano8-0/+15
2005-11-28ls-tree: work from subdirectory.Junio C Hamano1-5/+14
2005-11-28hash-object: work within subdirectory.Junio C Hamano1-3/+15
2005-11-28checkout-index: work from subdirectory.Junio C Hamano1-1/+11
2005-11-28fsck-objects: work from subdirectory.Junio C Hamano1-0/+2
2005-11-28peek-remote: honor proxy config even from subdirectory.Junio C Hamano1-0/+3
2005-11-28git-apply: work from subdirectory.Junio C Hamano1-0/+18
2005-11-28working from subdirectory: preparationJunio C Hamano2-3/+27
2005-11-28bisect: quote pathnames for eval safety.Junio C Hamano1-5/+20
2005-11-28bisect: limit the searchspace by pathspecsLinus Torvalds2-11/+17
2005-11-28ls-tree: match the test to the new semantics.Junio C Hamano3-56/+22
2005-11-28ls-tree: Resurrect funny name quoting lost during rewrite.Junio C Hamano1-1/+3
2005-11-28ls-tree: further tweaks of the rewriteLinus Torvalds1-4/+26
2005-11-28ls-tree: further cleanup to parallel ls-files.Linus Torvalds1-5/+4
2005-11-28ls-tree: major rewrite to do pathspecLinus Torvalds3-215/+55
2005-11-28write_name_quoted(): make one of the path a counted string.Junio C Hamano4-16/+29
2005-11-28Documentation: Describe merge operation a bit better.Junio C Hamano1-0/+95
2005-11-28Fix typo in http-push.cJan Andres1-1/+1
2005-11-28name-rev: fix parent counting.Junio C Hamano1-2/+2
2005-11-28rebase: one safety net, one bugfix and one optimization.Junio C Hamano1-1/+27
2005-11-28Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-41/+35
2005-11-28git-mv: quote $src in regexp properly.Junio C Hamano1-1/+1
2005-11-28[PATCH] gitk: Use i18n.commitencoding configuration item.Junio C Hamano1-1/+8
2005-11-28config.c: constness tightening to avoid compilation warning.Junio C Hamano1-1/+1
2005-11-28gitk: Fix diff this->selected and selected->this functionsPaul Mackerras1-12/+10
2005-11-28mailinfo: Do not use -u=<encoding>; say --encoding=<encoding>Junio C Hamano2-5/+12
2005-11-27mailinfo: Use i18n.commitencodingJunio C Hamano1-8/+9
2005-11-27mailinfo: allow -u to fall back on latin1 to utf8 conversion.Junio C Hamano1-24/+35
2005-11-27Introduce i18n.commitencoding.Junio C Hamano3-0/+9
2005-11-27Fix gitk this->selected diffsYann Dirson1-21/+32
2005-11-27Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-43/+45
2005-11-27git-mv: follow -k request even on failing renamesJosef Weidendorfer1-0/+5
2005-11-27Small fixes in Documentation/git-mv.txtJosef Weidendorfer1-4/+4
2005-11-27git-mv: fully detect 'directory moved into itself'Josef Weidendorfer1-1/+1
2005-11-27git-mv: keep git index consistent with file system on failed renameJosef Weidendorfer1-2/+10
2005-11-27git-mv: shrink usage, no usage on errorJosef Weidendorfer1-27/+19
2005-11-27setup_git_directory(): check repository format version.Junio C Hamano1-0/+1
2005-11-27init-db: check template and repository format.Junio C Hamano3-42/+64
2005-11-27Check repository format version in enter_repo().Junio C Hamano1-0/+1
2005-11-27Repository format version check.Junio C Hamano3-0/+22
2005-11-26format-patch: output filename reported to stdout verbatim.Junio C Hamano1-2/+2
2005-11-25name-rev: fix off-by-one error in --stdin.Junio C Hamano1-4/+3
2005-11-25git-mv is not able to handle big directoriesAlexander Litvinov1-9/+22
2005-11-25shell.c: complain on insufficient arguments.Junio C Hamano1-2/+1
2005-11-25GIT 0.99.9kv0.99.9kJunio C Hamano77-1804/+2856
2005-11-25git-sh-setup: move the repository check to a core program.Junio C Hamano1-7/+2
2005-11-25setup_git_directory: make sure GIT_DIR is a valid repository.Junio C Hamano1-5/+37
2005-11-25git-var: make it work in subdirectory.Junio C Hamano1-0/+2
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano26-31/+34
2005-11-25parse-remote and ls-remote clean-up.Junio C Hamano2-2/+3
2005-11-25Prevent "git-commit -a path1 path2..."Junio C Hamano1-1/+4
2005-11-25config.c: avoid shadowing global.Junio C Hamano1-5/+5
2005-11-25Fix a warning about unused value.YOSHIFUJI Hideaki / 吉藤英明1-1/+1
2005-11-25cvsimport: Don't let local settings hinder cvs user-migration.Andreas Ericsson1-1/+1
2005-11-24Rename git-config-set to git-repo-configJohannes Schindelin6-51/+51
2005-11-23diff-tree: teach single-commit diff-tree to honour graftsJunio C Hamano1-29/+25
2005-11-23Teach update-index to read from ls-tree.Junio C Hamano2-6/+8
2005-11-23git-revert: make --edit default.Junio C Hamano1-7/+11
2005-11-23Allow editing of a revert-messageLinus Torvalds1-1/+5
2005-11-23Fix git-mv for moving directories with 1 fileJosef Weidendorfer1-8/+17
2005-11-23git-merge: make recursive the default strategyJunio C Hamano1-8/+12
2005-11-23pack-redundant: type cleanups.Junio C Hamano1-10/+10
2005-11-23[PATCH] gitk: UTF-8 supportPavel Roskin1-2/+3
2005-11-23[PATCH] gitk: put braces around exprsJeff Hobbs1-41/+42
2005-11-22Fixed git:// IPv4 address problem when compiled with -DNO_IPV6.Paul Serice1-1/+1
2005-11-22arguments cleanup and some formattingAlex Riesen1-7/+8
2005-11-22remove unused variableAlex Riesen1-2/+0
2005-11-22speedup allocation in pack-redundant.cAlex Riesen1-6/+26
2005-11-22Make git-pack-redundant take a list of unimportant objs on stdinLukas Sandström1-0/+21
2005-11-22Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-1/+5
2005-11-21git-var: constness and globalness cleanup.Junio C Hamano3-9/+13
2005-11-21Move diff.renamelimit out of default configuration.Junio C Hamano8-9/+19
2005-11-21max-count in terms of intersectionLuben Tuikov1-2/+3
2005-11-21GIT: Fix compilation error in connect.cYOSHIFUJI Hideaki / 吉藤英明1-4/+5
2005-11-21Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.Andreas Ericsson1-13/+15
2005-11-21rename/copy score parsing updates.H. Peter Anvin1-12/+21
2005-11-21git-daemon not listening when compiled with -DNO_IPV6Paul Serice1-0/+6
2005-11-21git-repack: Properly abort in corrupt repositoryLinus Torvalds2-2/+2
2005-11-21Allow hierarchical section namesJohannes Schindelin2-9/+29
2005-11-21git-config-set: Properly terminate strings with '\0'Johannes Schindelin2-0/+2
2005-11-21git-proxy updates.Junio C Hamano1-7/+45
2005-11-21proxy-command support for git://Paul Collins1-1/+71
2005-11-21daemon: further tweaks.Junio C Hamano2-18/+14
2005-11-21git-daemon support for user-relative paths.Andreas Ericsson3-87/+72
2005-11-21tutorial: setting up a tree for subsystem maintainersJunio C Hamano1-1/+4
2005-11-21rename detection with -M100 means "exact renames only".Junio C Hamano2-0/+7
2005-11-21format-patch: fix two-argument special case, and make it easier to pick singl...Junio C Hamano1-2/+3
2005-11-21Fix hooks/update template.Junio C Hamano1-4/+3
2005-11-21Make sure heads/foo and tags/foo do not confuse things.Junio C Hamano2-6/+24
2005-11-20Fix "do not DWIM" patch to enter_repo"Junio C Hamano1-1/+1
2005-11-20git-reset.txt: Small fix + clarifications.Andreas Ericsson1-4/+15
2005-11-20Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPR...Ryan Anderson1-10/+15
2005-11-20Fix sparse warningsTimo Hirvonen4-32/+31
2005-11-21gitk: Disable fastdate stuff for nowPaul Mackerras1-1/+5
2005-11-20Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-83/+50
2005-11-20git-config-set: support selecting values by non-matching regexJohannes Schindelin4-8/+70
2005-11-20merge-recursive: Replace 'except:'Fredrik Kuivinen1-2/+2
2005-11-20merge-one-file: use rmdir -pJunio C Hamano1-5/+1
2005-11-20gitk: Fix some bugs introduced by speedup changesPaul Mackerras1-11/+12
2005-11-19Documentation: add hooks/update example.Junio C Hamano1-0/+105
2005-11-19git-config-set: add more optionsJohannes Schindelin5-61/+258
2005-11-19Documentation update for user-relative paths.Andreas Ericsson1-5/+24
2005-11-19Client side support for user-relative paths.Andreas Ericsson1-22/+33
2005-11-19Server-side support for user-relative paths.Andreas Ericsson2-25/+7
2005-11-19Do not DWIM in userpath library under strict mode.Junio C Hamano2-57/+60
2005-11-19Library code for user-relative paths, take three.Andreas Ericsson2-0/+73
2005-11-19Add test case for git-config-setJohannes Schindelin1-0/+180
2005-11-19Add documentation for git-config-setJohannes Schindelin2-0/+111
2005-11-19Add git-config-set, a simple helper for scripts to set config variablesJohannes Schindelin3-1/+29
2005-11-19Add functions git_config_set() and git_config_set_multivar()Johannes Schindelin2-1/+295
2005-11-19Decide whether to build http-push in the MakefileNick Hengeveld2-12/+6
2005-11-19http.c: reorder to avoid compilation failure.Junio C Hamano1-36/+35
2005-11-19http-push memory/fd cleanupNick Hengeveld1-3/+14
2005-11-19Improve XML parsing in http-pushNick Hengeveld1-156/+163
2005-11-19Improve pack list response handlingNick Hengeveld1-2/+10
2005-11-19Make http-fetch request types more clearNick Hengeveld1-136/+139
2005-11-19Isolate shared HTTP request functionalityNick Hengeveld5-976/+635
2005-11-19merge-recursive::removeFile: remove empty directoriesJunio C Hamano1-0/+4
2005-11-19merge-one-file: remove empty directoriesJunio C Hamano1-1/+6
2005-11-19Documentation: rebase-from-internal minor updates.Junio C Hamano1-5/+2
2005-11-19git-repack: do not do complex redundancy check.Junio C Hamano1-21/+14
2005-11-19git-count-objects: dc replacementJunio C Hamano1-1/+19
2005-11-19gitk: moving all three panes if clicking on an arrow.Stefan-W. Hahn1-1/+3
2005-11-19gitk: use git-diff-tree --no-commit-idPavel Roskin1-4/+2
2005-11-18gitk: Specify line hover fontFrank Sorenson1-1/+1
2005-11-18readrefs: grab all refs with one call to ls-remote.Junio C Hamano1-66/+32
2005-11-18Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano1-68/+102
2005-11-18Merge branch 'master'Junio C Hamano11-93/+154
2005-11-18Merge branches 'jc/branch' and 'jc/rebase'Junio C Hamano2-63/+34
2005-11-18Rewrite rebase to use git-format-patch piped to git-am.Junio C Hamano1-56/+16
2005-11-18git-branch: -f to forcibly reset branch head.Junio C Hamano1-7/+18
2005-11-18Do not show .exe in git command list.Junio C Hamano1-1/+4
2005-11-18Document the "ignore objects" feature of git-pack-redundantLukas Sandström1-0/+8
2005-11-18Improve the readability of git-pack-redundantLukas Sandström1-13/+24
2005-11-18Remove all old packfiles when doing "git repack -a -d"Lukas Sandström1-3/+16
2005-11-18Update pull/fetch --tags documentationLuck, Tony1-1/+3
2005-11-18Fix a bug in get_all_permutations.Lukas Sandström1-0/+1
2005-11-18Cygwin *might* be helped with NO_MMAPJunio C Hamano1-0/+4
2005-11-18Teach "approxidate" about weekday syntaxLinus Torvalds1-5/+49
2005-11-18Make "git fetch" less verbose by defaultLinus Torvalds1-5/+9
2005-11-18Fix bug introduced by the latest changes to git-pack-redundantLukas Sandström1-1/+1
2005-11-18git-prune: quote possibly empty $dryrun as parameter to testJunio C Hamano1-1/+1
2005-11-18Merge branch 'master'Junio C Hamano8-79/+220
2005-11-17git-am: --binary; document --resume and --binary.Junio C Hamano2-14/+30
2005-11-17Teach "approxidate" about weekday syntaxLinus Torvalds1-1/+17
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-23 19:52:18 +0000