| 2005-12-04 |
Jason Riedy | Add compat/setenv.c, use in git.c.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | New test case: Criss-cross merge
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | New test case: merge with directory/file conflicts
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | test-lib.sh: Add new function, test_expect_code
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-03 |
Fredrik Kuivinen | git-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 name | documentation: git-tag
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-02 |
Junio C Hamano | documentation: git-bisect (help HTML break man)
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-02 |
No name | documentation: clarify read-tree --reset
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-02 |
Junio C Hamano | git-merge documentation: conflicting merge leaves higher...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-02 |
Junio C Hamano | merge-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 Hamano | merge-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 Hamano | t3100: add ls-tree -t and -d tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-02 |
Junio C Hamano | merge-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 Riesen | git wrapper: more careful argument stuffing
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-02 |
Junio C Hamano | git-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 Hamano | ls-tree: --name-only
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-01 |
Junio C Hamano | ls-tree: resurrect '-d' to mean 'show trees only'
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-01 |
Linus Torvalds | git-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 Hamano | Makefile: say the default target upfront.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-01 |
Junio C Hamano | Documentation: describe '-f' option to git-fetch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-12-01 |
Timo Hirvonen | Move couple of ifdefs after "include config.mk"
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-30 |
Junio C Hamano | Merge branch 'jc/subdir'
|
commit | commitdiff | tree |
| 2005-11-30 |
Junio C Hamano | Merge branches 'jc/apply', 'lt/ls-tree', 'lt/bisect...
|
commit | commitdiff | tree |
| 2005-11-30 |
Tommi Virtanen | Do 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 Hamano | Tutorial: adjust merge example to recursive strategy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-30 |
Junio C Hamano | merge-recursive: match the unmerged index entry behaviour...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-30 |
Junio C Hamano | diff-files: show diffs with stage0 and unmerged stage...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-30 |
Linus Torvalds | merge-one-file: leave unmerged index entries upon automerge...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-30 |
Linus Torvalds | diff-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 Hamano | git-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 Hamano | Merge http://www.kernel.org/pub/scm/gitk/gitk
|
commit | commitdiff | tree |
| 2005-11-29 |
Alex Riesen | [PATCH] Add tests for git-mv in subdirectories
Junio C Hamano, Sat, Nov 26, 2005 03:45:52 +0100:
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 Hamano | format-patch: run diff in C locale
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | format-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 Hamano | format-patch: remove applies-to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | applypatch: use "index" lines not "applies-to".
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | applymbox: typofix to enable -m option.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Matthias Urlichs | SVN import: Use one log call
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
jdl@freescale.com | Fix typos and minor format issues.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Nick Hengeveld | http-push cleanup
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Pavel Roskin | git-clone --shared should imply --local
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | hash-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 Hamano | define die() for scripts that use it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | verify-tag: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | tag: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | lost-found: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | branch: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | ls-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 Hamano | count-objects: make it operable from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | Make 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 Hamano | Make networking commands to work from a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | ls-tree: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | hash-object: work within subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | checkout-index: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | fsck-objects: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | peek-remote: honor proxy config even from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | git-apply: work from subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | working from subdirectory: preparation
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | bisect: quote pathnames for eval safety.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Linus Torvalds | bisect: limit the searchspace by pathspecs
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | ls-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 Hamano | ls-tree: Resurrect funny name quoting lost during rewrite.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Linus Torvalds | ls-tree: further tweaks of the rewrite
|
commit | commitdiff | tree |
| 2005-11-29 |
Linus Torvalds | ls-tree: further cleanup to parallel ls-files.
|
commit | commitdiff | tree |
| 2005-11-29 |
Linus Torvalds | ls-tree: major rewrite to do pathspec
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | write_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 Hamano | Documentation: Describe merge operation a bit better.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-29 |
Jan Andres | Fix typo in http-push.c
|
commit | commitdiff | tree |
| 2005-11-29 |
Junio C Hamano | name-rev: fix parent counting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-28 |
Junio C Hamano | rebase: 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 Hamano | Merge http://www.kernel.org/pub/scm/gitk/gitk
|
commit | commitdiff | tree |
| 2005-11-28 |
Junio C Hamano | git-mv: quote $src in regexp properly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-28 |
Junio C Hamano | config.c: constness tightening to avoid compilation...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-28 |
Junio C Hamano | mailinfo: Do not use -u=<encoding>; say --encoding...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-28 |
Junio C Hamano | mailinfo: Use i18n.commitencoding
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-28 |
Junio C Hamano | mailinfo: 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 Hamano | Introduce i18n.commitencoding.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Yann Dirson | Fix gitk this->selected diffs
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Junio C Hamano | Merge http://www.kernel.org/pub/scm/gitk/gitk
|
commit | commitdiff | tree |
| 2005-11-27 |
Josef Weidendorfer | git-mv: follow -k request even on failing renames
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Josef Weidendorfer | Small fixes in Documentation/git-mv.txt
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Josef Weidendorfer | git-mv: fully detect 'directory moved into itself'
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Josef Weidendorfer | git-mv: keep git index consistent with file system...
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Josef Weidendorfer | git-mv: shrink usage, no usage on error
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Junio C Hamano | setup_git_directory(): check repository format version.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Junio C Hamano | init-db: check template and repository format.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Junio C Hamano | Check repository format version in enter_repo().
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-27 |
Junio C Hamano | Repository format version check.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-26 |
Junio C Hamano | format-patch: output filename reported to stdout verbatim.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-26 |
Junio C Hamano | name-rev: fix off-by-one error in --stdin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-26 |
Alexander Litvinov | git-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 Hamano | shell.c: complain on insufficient arguments.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-25 |
Junio C Hamano | git-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 Hamano | setup_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 Hamano | git-var: make it work in subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-25 |
Junio C Hamano | git-sh-setup: die if outside git repository.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-25 |
Junio C Hamano | parse-remote and ls-remote clean-up.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-25 |
Junio C Hamano | Prevent "git-commit -a path1 path2..."
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
| 2005-11-25 |
Junio C Hamano | config.c: avoid shadowing global.
Signed-off-by: Junio C Hamano <junkio@cox.net>
|
commit | commitdiff | tree |
