Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 16, 2012
  1. @gitster

    rerere.c: mark private file-scope symbols as static

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 8, 2011
  1. @gitster

    rerere: libify rerere_clear() and rerere_gc()

    gitster authored
    This moves the two features from builtin/rerere.c to a more library-ish
    portion of the codebase.  No behaviour change.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 20, 2010
  1. @gitster

    Merge branch 'jc/cache-unmerge'

    gitster authored
    * 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 authored
    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 authored
    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>
Something went wrong with that request. Please try again.