?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'maint-1.6.0' into maint-1.6.1
2009-06-21 Miklos Vajnagit-svn documentation: fix typo in 'rebase vs. pull...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2009-01-15 Miklos VajnaMake t3411 executable
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2009-01-03 Miklos Vajnafast-export: print usage when no options specified
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-23 Miklos Vajnat9129: skip the last three tests if UTF-8 locale is...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-20 Miklos VajnaSubmittingPatches: mention the usage of real name in...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-17 Miklos Vajnagithooks documentation: add a note about the +x mode
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-17 Miklos Vajnagit-daemon documentation: use {tilde}
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-10 Miklos Vajnagit-gui: Update Hungarian translation for 0.12
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-07 Miklos Vajnahttp.c: use 'git_config_string' to get 'curl_http_proxy'
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-03 Miklos Vajnasubmodule: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-03 Miklos Vajnarebase: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-03 Miklos Vajnapull: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-03 Miklos Vajnalost-found: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-03 Miklos Vajnafilter-branch: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-03 Miklos Vajnagit-stash: use git rev-parse -q
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-12-02 Miklos VajnaUser's Manual: remove duplicated url at the end of...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-25 Miklos Vajnabuiltin_clone: use strbuf in cmd_clone()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-25 Miklos Vajnabuiltin-clone: use strbuf in clone_local() and copy_or_link_...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-25 Miklos Vajnabuiltin-clone: use strbuf in guess_dir_name()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-24 Miklos VajnaAdd new testcase to show fast-export does not always...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-18 Miklos Vajnabuiltin-branch: use strbuf in rename_branch()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-18 Miklos Vajnabuiltin-branch: use strbuf in fill_tracking_info()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-18 Miklos Vajnabuiltin-branch: use strbuf in delete_branches()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-18 Miklos VajnaUpdate Hungarian translation. 100% completed.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-12 Miklos Vajnagit-remote: document the migration feature of the rename...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-12 Miklos Vajnagit-remote rename: migrate from remotes/ and branches/
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-11 Miklos Vajnaremote: add a new 'origin' variable to the struct
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-05 Miklos VajnaImplement git remote rename
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-11-01 Miklos Vajnaupdate-ref --no-deref -d: handle the case when the...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-30 Miklos Vajnagit branch -m: forbid renaming of a symref
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-26 Miklos VajnaFix git update-ref --no-deref -d.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-26 Miklos Vajnarename_ref(): handle the case when the reflog of a...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-26 Miklos VajnaFix git branch -m for symrefs.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-19 Miklos Vajnaparse-opt: migrate builtin-checkout-index.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-14 Miklos VajnaAdd testcase to ensure merging an early part of a branch...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-14 Miklos VajnaAdd Linux PPC support to the pre-auto-gc example hook
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-10 Miklos Vajnatest-lib: fix color reset in say_color()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-09 Miklos VajnaImplement git clone -v
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-09 Miklos VajnaCleanup in sha1_file.c::cache_or_unpack_entry()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-03 Miklos Vajnabuiltin-commit: use reduce_heads() only when appropriate
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-10-03 Miklos Vajnabuiltin-merge: refresh the index before calling a strategy
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-10 Miklos Vajnat7603: add new testcases to ensure builtin-commit uses...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-10 Miklos Vajnabuiltin-commit: use commit_tree()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-10 Miklos Vajnacommit_tree(): add a new author parameter
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-10 Miklos Vajnat7501: always use test_cmp instead of diff
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-07 Miklos Vajnabuiltin-merge: release the lockfile in try_merge_strategy()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-05 Miklos Vajnamerge-recursive: get rid of virtual_id
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-05 Miklos Vajnamerge-recursive: move current_{file,directory}_set...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-05 Miklos Vajnamerge-recursive: move the global obuf to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-05 Miklos Vajnamerge-recursive: get rid of the index_only global variable
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-04 Miklos Vajnamerge-recursive: move call_depth to struct merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-03 Miklos VajnaMakefile: add merge_recursive.h to LIB_H
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-09-03 Miklos Vajnacherry-pick/revert: make direct internal call to merge_tree()
 commit | commitdiff | tree
2008-08-31 Miklos Vajnabuiltin-merge: avoid run_command_v_opt() for recursive...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-31 Miklos Vajnamerge-recursive: introduce merge_options
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-31 Miklos VajnaSplit out merge_recursive() to merge-recursive.c
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-24 Miklos VajnaMakefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-22 Miklos VajnaFix 'git help help'
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-17 Miklos Vajnat9300: replace '!' with test_must_fail
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-16 Miklos VajnaDocumentation: document the pager.* configuration setting
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-08-03 Miklos VajnaBuiltin git-help.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-31 Miklos Vajnabuiltin-help: always load_command_list() in cmd_help()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-30 Miklos VajnaAdd a second testcase for handling invalid strategies...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-30 Miklos VajnaAdd a new test for using a custom merge strategy
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-30 Miklos Vajnabuiltin-merge: allow using a custom strategy
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-30 Miklos Vajnabuiltin-help: make some internal functions available...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-23 Miklos Vajnat7601: extend the 'merge picks up the best result'...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-22 Miklos Vajnabuiltin-merge: give a proper error message for invalid...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-20 Miklos VajnaTeach 'git merge' that some merge strategies no longer...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-13 Miklos VajnaAdd a new test for git-merge-resolve
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-13 Miklos Vajnat6021: add a new test for git-merge-resolve
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-12 Miklos Vajnamake remove-dashes: apply to scripts and programs as...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-12 Miklos Vajnagit-bisect: use dash-less form on git bisect log
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-12 Miklos Vajnat1007-hash-object.sh: use quotes for the test description
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-12 Miklos Vajnat0001-init.sh: change confusing directory name
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-08 Miklos VajnaBuild in merge
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-07 Miklos VajnaFix t7601-merge-pull-config.sh on AIX
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-07 Miklos Vajnagit-commit-tree: make it usable from other builtins
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-07 Miklos VajnaAdd new test case to ensure git-merge prepends the...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-06 Miklos Vajnahg-to-git: use git init instead of git init-db
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-06 Miklos Vajnahg-to-git: rewrite "git-frotz" to "git frotz"
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-06 Miklos Vajnahg-to-git: abort if the project directory is not a...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-06 Miklos Vajnahg-to-git: avoid raising a string exception
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-06 Miklos VajnaINSTALL: Update section about git-frotz form.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-05 Miklos VajnaRetire 'stupid' merge strategy
 commit | commitdiff | tree
2008-07-01 Miklos VajnaAdd new test case to ensure git-merge reduces octopus...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaAdd new test to ensure git-merge handles more than...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaIntroduce get_octopus_merge_bases() in commit.c
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos Vajnagit-fmt-merge-msg: make it usable from other builtins
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaMove read_cache_unmerged() to read-cache.c
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaAdd new test to ensure git-merge handles pull.twohead...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaMove parse-options's skip_prefix() to git-compat-util.h
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaMove commit_list_count() to commit.c
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-07-01 Miklos VajnaMove split_cmdline() to alias.c
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-06-17 Miklos Vajnapath-list documentation: document all functions and...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-06-17 Miklos Vajnarun-command documentation: fix "memset()" parameter
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-06-09 Miklos Vajnagit-read-tree: document -v option.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-06-08 Miklos VajnaA simple script to parse the results from the testcases
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-06-08 Miklos Vajnagit-rebase -i: mention the short command aliases in...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-06-08 Miklos VajnaRemove unused code in parse_commit_buffer()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
next