projects / git.git / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
New test case: merge with directory/file conflicts
2005-12-03 Fredrik KuivinenNew test case: merge with directory/file conflicts
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-03 Fredrik Kuivinentest-lib.sh: Add new function, test_expect_code
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-03 Fredrik Kuivinengit-merge: Exit with code 2 if no strategy was able...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 No namedocumentation: git-tag
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanodocumentation: git-bisect (help HTML break man)
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 No namedocumentation: clarify read-tree --reset
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanogit-merge documentation: conflicting merge leaves higher...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanomerge-one-file: make sure we do not mismerge symbolic...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanomerge-one-file: make sure we create the merged file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanot3100: add ls-tree -t and -d tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanomerge-recursive: adjust git-ls-tree use for the latest.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Alex Riesengit wrapper: more careful argument stuffing
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-02 Junio C Hamanogit-merge-one-file: do not worry about 'rmdir -p' not...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-01 Junio C Hamanols-tree: --name-only
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-01 Junio C Hamanols-tree: resurrect '-d' to mean 'show trees only'
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-01 Linus Torvaldsgit-ls-tree: add "-t" option to always show the tree...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-01 Junio C HamanoMakefile: say the default target upfront.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-01 Junio C HamanoDocumentation: describe '-f' option to git-fetch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-12-01 Timo HirvonenMove couple of ifdefs after "include config.mk"
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Junio C HamanoMerge branch 'jc/subdir'
 commit | commitdiff | tree
2005-11-30 Junio C HamanoMerge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect...
commit | commitdiff | tree
2005-11-30 Tommi VirtanenDo not attempt to access literal dirname "GIT_OBJECT_DIRECTORY".
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Junio C HamanoTutorial: adjust merge example to recursive strategy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Junio C Hamanomerge-recursive: match the unmerged index entry behaviour...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Junio C Hamanodiff-files: show diffs with stage0 and unmerged stage...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Linus Torvaldsmerge-one-file: leave unmerged index entries upon automerge...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Linus Torvaldsdiff-files: -1/-2/-3 to diff against unmerged stage.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-30 Junio C Hamanogit-diff: do not turn off -p/-M with any diff options.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
 commit | commitdiff | tree
2005-11-29 Alex Riesen[PATCH] Add tests for git-mv in subdirectories
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Johannes Schindelin[PATCH] Make git-mv work in subdirectories, too
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoformat-patch: run diff in C locale
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoformat-patch: do not abuse 3-dash marker line.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoformat-patch: remove applies-to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoapplypatch: use "index" lines not "applies-to".
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoapplymbox: typofix to enable -m option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Matthias UrlichsSVN import: Use one log call
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 jdl@freescale.comFix typos and minor format issues.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Nick Hengeveldhttp-push cleanup
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Pavel Roskingit-clone --shared should imply --local
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanohash-object.c: type-fix to squelch compiler warnings.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanodefine die() for scripts that use it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoverify-tag: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanotag: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanolost-found: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanobranch: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanols-remote: define die() now we do not use git-sh-setup
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanocount-objects: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C HamanoMake the rest of commands work from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C HamanoMake networking commands to work from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanols-tree: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanohash-object: work within subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanocheckout-index: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanofsck-objects: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanopeek-remote: honor proxy config even from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanogit-apply: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoworking from subdirectory: preparation
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanobisect: quote pathnames for eval safety.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Linus Torvaldsbisect: limit the searchspace by pathspecs
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanols-tree: match the test to the new semantics.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C Hamanols-tree: Resurrect funny name quoting lost during rewrite.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Linus Torvaldsls-tree: further tweaks of the rewrite
 commit | commitdiff | tree
2005-11-29 Linus Torvaldsls-tree: further cleanup to parallel ls-files.
 commit | commitdiff | tree
2005-11-29 Linus Torvaldsls-tree: major rewrite to do pathspec
 commit | commitdiff | tree
2005-11-29 Junio C Hamanowrite_name_quoted(): make one of the path a counted...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Junio C HamanoDocumentation: Describe merge operation a bit better.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-29 Jan AndresFix typo in http-push.c
 commit | commitdiff | tree
2005-11-29 Junio C Hamanoname-rev: fix parent counting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C Hamanorebase: one safety net, one bugfix and one optimization.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
 commit | commitdiff | tree
2005-11-28 Junio C Hamanogit-mv: quote $src in regexp properly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C Hamanoconfig.c: constness tightening to avoid compilation...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C Hamanomailinfo: Do not use -u=<encoding>; say --encoding...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C Hamanomailinfo: Use i18n.commitencoding
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C Hamanomailinfo: allow -u to fall back on latin1 to utf8 conversion.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-28 Junio C HamanoIntroduce i18n.commitencoding.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Yann DirsonFix gitk this->selected diffs
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
 commit | commitdiff | tree
2005-11-27 Josef Weidendorfergit-mv: follow -k request even on failing renames
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Josef WeidendorferSmall fixes in Documentation/git-mv.txt
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Josef Weidendorfergit-mv: fully detect 'directory moved into itself'
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Josef Weidendorfergit-mv: keep git index consistent with file system...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Josef Weidendorfergit-mv: shrink usage, no usage on error
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Junio C Hamanosetup_git_directory(): check repository format version.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Junio C Hamanoinit-db: check template and repository format.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Junio C HamanoCheck repository format version in enter_repo().
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-27 Junio C HamanoRepository format version check.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-26 Junio C Hamanoformat-patch: output filename reported to stdout verbatim.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-26 Junio C Hamanoname-rev: fix off-by-one error in --stdin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-26 Alexander Litvinovgit-mv is not able to handle big directories
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-26 Junio C Hamanoshell.c: complain on insufficient arguments.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C Hamanogit-sh-setup: move the repository check to a core program.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C Hamanosetup_git_directory: make sure GIT_DIR is a valid repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C Hamanogit-var: make it work in subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C Hamanogit-sh-setup: die if outside git repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C Hamanoparse-remote and ls-remote clean-up.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C HamanoPrevent "git-commit -a path1 path2..."
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Junio C Hamanoconfig.c: avoid shadowing global.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 YOSHIFUJI Hideaki... Fix a warning about unused value.
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
2005-11-25 Andreas Ericssoncvsimport: Don't let local settings hinder cvs user...
Signed-off-by: Junio C Hamano <junkio@cox.net>
 commit | commitdiff | tree
next
The core git plumbing