?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
builtin-merge: release the lockfile in try_merge_strategy()
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 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
2008-06-04 Miklos VajnaStrbuf documentation: document most functions
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-05-31 Miklos VajnaRevision walking documentation: document most important...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-05-25 Miklos VajnaCodingGuidelines: Add a note to avoid assignments inside...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-05-21 Miklos Vajnagit-merge: exclude unnecessary options from OPTIONS_SPEC
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-05-16 Miklos Vajnagit-fast-import: rename cmd_*() functions to parse_*()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-05-05 Miklos VajnaINSTALL: add a note about GNU interactive tools has...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-30 Miklos VajnaAdd tests for sendemail.cc configuration variable
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-30 Miklos Vajnagit-send-email: add a new sendemail.cc configuration...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-30 Miklos Vajnagit-format-patch: add a new format.cc configuration...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-27 Miklos Vajnagit checkout: add -t alias for --track
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-23 Miklos Vajnadiff options documentation: refer to --diff-filter...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-09 Miklos Vajnacontrib/hooks: add an example pre-auto-gc hook
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-09 Miklos VajnaDocumentation/hooks: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-04-09 Miklos Vajnagit-gc --auto: add pre-auto-gc hook
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-03-19 Miklos VajnaDocumentation/git-merge: document subtree strategy.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-03-15 Miklos Vajnagit-gui: Updated Hungarian translation (e5fba18)
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-03-13 Miklos VajnaUpdate Hungarian translation. 100% completed.
 commit | commitdiff | tree
2008-02-29 Miklos VajnaImprove t6029 to check the real "subtree" case
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-02-27 Miklos VajnaDocumentation/git svn log: add a note about timezones.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-02-25 Miklos VajnaDocumentation/git-filter-branch: add a new msg-filter...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-02-21 Miklos Vajnagit-clean: handle errors if removing files fails
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-02-20 Miklos VajnaDocumentation/git-stash: document options for git stash...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-02-13 Miklos Vajnagit clone -s documentation: force a new paragraph for...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-02-11 Miklos Vajnabuiltin-gc.c: guard config parser from value=NULL
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-31 Miklos Vajnagit rev-parse manpage: spelling fix
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-26 Miklos Vajnagit pull manpage: don't include -n from fetch-options.txt
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-23 Miklos Vajnagit-clone -s: document problems with git gc --prune
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-18 Miklos VajnaInclude rev-list options in git-log manpage.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-16 Miklos Vajnals-remote: add -t and -h options.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-15 Miklos VajnaAdd using merge subtree How-To
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2008-01-05 Miklos Vajnat/t7001: avoid unnecessary ERE when using grep
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-12-29 Miklos Vajnagit-sh-setup: document git_editor() and get_author_ident_fro...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-12-21 Miklos Vajnaeveryday: replace 'prune' and 'repack' with 'gc'
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-12-05 Miklos VajnaUpdate Hungarian translation. 100% completed.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-12-05 Miklos VajnaInclude diff options in the git-log manpage
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-10-25 Miklos Vajnagit-send-email: add a new sendemail.to configuration...
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-10-01 Miklos Vajnagit stash: document apply's --index switch
 commit | commitdiff | tree
2007-09-29 Miklos Vajnagit-bundle: fix commandline examples in the manpage
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-09-23 Miklos VajnaUser Manual: add a chapter for submodules
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-09-02 Miklos VajnaHungarian translation of git-gui
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-07-12 Miklos Vajnagitweb: new cgi parameter: opt
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-07-07 Miklos Vajnagitweb: prefer git_get_project_owner() over get_file_owner()
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
2007-07-04 Miklos VajnaDocument -<n> for git-format-patch
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
 commit | commitdiff | tree
MinGW port of GIT