Skip to content
Commits on Jan 20, 2010
  1. @gitster

    Merge branch 'jc/cache-unmerge'

    gitster committed Jan 20, 2010
    * jc/cache-unmerge:
      rerere forget path: forget recorded resolution
      rerere: refactor rerere logic to make it independent from I/O
      rerere: remove silly 1024-byte line limit
      resolve-undo: teach "update-index --unresolve" to use resolve-undo info
      resolve-undo: "checkout -m path" uses resolve-undo information
      resolve-undo: allow plumbing to clear the information
      resolve-undo: basic tests
      resolve-undo: record resolved conflicts in a new index extension section
      builtin-merge.c: use standard active_cache macros
    
    Conflicts:
    	builtin-ls-files.c
    	builtin-merge.c
    	builtin-rerere.c
Commits on Jan 11, 2010
  1. @gitster

    rerere forget path: forget recorded resolution

    gitster committed Dec 25, 2009
    After you find out an earlier resolution you told rerere to use was a
    mismerge, there is no easy way to clear it.  A new subcommand "forget" can
    be used to tell git to forget a recorded resolution, so that you can redo
    the merge from scratch.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 4, 2009
  1. @gitster

    Teach --[no-]rerere-autoupdate option to merge, revert and friends

    gitster committed Dec 4, 2009
    Introduce a command line option to override rerere.autoupdate configuration
    variable to make it more useful.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 15, 2009
  1. @szeder @gitster

    rerere: remove duplicated functions

    szeder committed with gitster Feb 14, 2009
    Both rerere.c and builtin-rerere.c define the static functions
    rr_path() and has_resolution() the exact same way.  To eliminate this
    code duplication this patch turns the functions in rerere.c
    non-static, and makes builtin-rerere.c use them.  Also, since this
    puts these two functions into the global namespace, rename them to
    rerere_path() and has_rerere_resolution(), respectively, and rename
    their "name" parameter to "hex", because it better reflects what that
    parameter actually is.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 22, 2008
  1. @dscho @gitster

    Rename path_list to string_list

    dscho committed with gitster Jul 21, 2008
    The name path_list was correct for the first usage of that data structure,
    but it really is a general-purpose string list.
    
    $ perl -i -pe 's/path-list/string-list/g' $(git grep -l path-list)
    $ perl -i -pe 's/path_list/string_list/g' $(git grep -l path_list)
    $ git mv path-list.h string-list.h
    $ git mv path-list.c string-list.c
    $ perl -i -pe 's/has_path/has_string/g' $(git grep -l has_path)
    $ perl -i -pe 's/path/string/g' string-list.[ch]
    $ git mv Documentation/technical/api-path-list.txt \
    	Documentation/technical/api-string-list.txt
    $ perl -i -pe 's/strdup_paths/strdup_strings/g' $(git grep -l strdup_paths)
    
    ... and then fix all users of string-list to access the member "string"
    instead of "path".
    
    Documentation/technical/api-string-list.txt needed some rewrapping, too.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 10, 2008
  1. @sbeyer @gitster

    rerere: Separate libgit and builtin functions

    sbeyer committed with gitster Jul 9, 2008
    This patch moves rerere()-related functions into a newly created
    rerere.c file.
    The setup_rerere() function is needed by both rerere() and cmd_rerere(),
    so this function is moved to rerere.c and declared non-static (and "extern")
    in newly created rerere.h file.
    
    Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.