?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'maint'
2013-12-30 Christian Couderreplace info: rename 'full' to 'long' and clarify in...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian CouderDocumentation/git-replace: describe --format option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Couderbuiltin/replace: unset read_replace_refs
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Coudert6050: add tests for listing with --format
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Couderbuiltin/replace: teach listing using short, medium...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Coudersha1_file: perform object replacement in sha1_object_info_ex...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Coudert6050: show that git cat-file --batch fails with replace...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Coudersha1_object_info_extended(): add an "unsigned flags...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Coudersha1_file.c: add lookup_replace_object_extended() to...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Couderreplace_object: don't check read_replace_refs twice
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-12 Christian Couderrename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-05 Christian Couderreplace {pre,suf}fixcmp() with {starts,ends}_with()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-05 Christian Couderstrbuf: introduce starts_with() and ends_with()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-05 Christian Couderbuiltin/remote: remove postfixcmp() and use suffixcmp...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-12-05 Christian Couderenvironment: normalize use of prefixcmp() by removing...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-10-28 Christian Coudersha1_file: move comment about return value where it...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian Coudert6050-replace: use some long option names
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian Couderreplace: allow long option names
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian CouderDocumentation/replace: add Creating Replacement Objects...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian Coudert6050-replace: add test to clean up all the replace...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian Coudert6050-replace: test that objects are of the same type
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian CouderDocumentation/replace: state that objects must be of...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-09-06 Christian Couderreplace: forbid replacing an object with one of a different...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-01-30 Christian Coudergitk: Ignore gitk-wish buildproduct
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2013-01-10 Christian CouderMakefile: detect when PYTHON_PATH changes
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2012-12-25 Christian CouderMakefile: replace "echo 1>..." with "echo >..."
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2012-12-19 Christian CouderMakefile: replace "echo 1>..." with "echo >..."
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2012-12-19 Christian CouderMakefile: detect when PYTHON_PATH changes
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2012-12-18 Christian CouderMakefile: remove tracking of TCLTK_PATH
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2012-04-22 Christian Couderrevert: add missing va_end
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2011-09-21 Christian Couderbisect: fix exiting when checkout failed in bisect_start()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-09-27 Christian Coudert6050 (replace): fix bogus "fetch branch with replacement...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Couderblame: use find_commit_subject() instead of custom...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Coudermerge-recursive: use find_commit_subject() instead...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Couderbisect: use find_commit_subject() instead of custom...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Couderrevert: rename variables related to subject in get_message()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Couderrevert: refactor code to find commit subject in find_commit_...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Couderrevert: fix off by one read when searching the end...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-23 Christian Coudert3508: add check_head_differs_from() helper function...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-16 Christian Couderrevert: improve success message by adding abbreviated...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-16 Christian Couderrevert: don't print "Finished one cherry-pick." if...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-16 Christian Couderrevert: refactor commit code into a new run_git_commit...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-07-16 Christian Couderrevert: report success when using option --strategy
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-25 Christian CouderDocumentation: grep: fix asciidoc problem with --
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-25 Christian Couderrevert: accept arbitrary rev-list options
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-13 Christian Coudercommit: use value of GIT_REFLOG_ACTION env variable...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-06 Christian Couderdiff: fix "git show -C -C" output when renaming a binary...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian CouderDocumentation/revert: describe passing more than one...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian CouderDocumentation/cherry-pick: describe passing more than...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian Couderrevert: add tests to check cherry-picking many commits
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian Couderrevert: allow cherry-picking more than one commit
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian Couderrevert: change help_msg() to take no argument
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian Couderrevert: refactor code into a do_pick_commit() function
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian Couderrevert: use run_command_v_opt() instead of execv_git_cmd()
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-06-02 Christian Couderrevert: cleanup code for -x option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-04-01 Christian Couderrevert: add "--strategy" option to choose merge strategy
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-04-01 Christian Coudermerge: make function try_merge_command non static
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-04-01 Christian Coudermerge: refactor code that calls "git merge-STRATEGY"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-04-01 Christian Couderrevert: refactor merge recursive code into its own...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-04-01 Christian Couderrevert: use strbuf to refactor the code that writes...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-20 Christian Couderrebase -i: use new --ff cherry-pick option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-07 Christian CouderDocumentation: describe new cherry-pick --ff option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-07 Christian Coudercherry-pick: add tests for new --ff option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-07 Christian Couderreset: disallow using --keep when there are unmerged...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-07 Christian Couderreset: disallow "reset --keep" outside a work tree
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-07 Christian CouderDocumentation: reset: describe new "--keep" option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-03-01 Christian Couderbisect: error out when passing bad path parameters
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-25 Christian Couderreset: add test cases for "--keep" option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-25 Christian Couderreset: add option "--keep" to "git reset"
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-23 Christian CouderDocumentation: rev-list: fix synopsys for --tags and...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-16 Christian Coudert7111: fix bad HEAD in tests with unmerged entries
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-10 Christian Couderhelp: fix configured help format taking over command...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-10 Christian Coudert7111: check that reset options work as described in...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2010-01-05 Christian CouderDocumentation: reset: add some missing tables
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-12-30 Christian Couderreset: add a few tests for "git reset --merge"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-12-30 Christian CouderDocumentation: reset: add some tables to describe the...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-12-30 Christian Couderreset: improve mixed reset error message when in a...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-12-13 Christian Coudergitk: Add "--no-replace-objects" option
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-11-24 Christian CouderDocumentation: update descriptions of revision options...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-11-23 Christian Couderbisect: simplify calling visualizer using '--bisect...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-11-21 Christian CouderDocumentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-11-21 Christian CouderDocumentation: fix typos and spelling in replace documentation
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-11-21 Christian Couderreplace: use a GIT_NO_REPLACE_OBJECTS env variable
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-11-09 Christian CouderDocumentation: add "Fighting regressions with git bisect...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-10-13 Christian Coudergit: add --no-replace-objects option to disable replacing
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-13 Christian CouderDocumentation: remove warning saying that "git bisect...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-13 Christian Couderbisect: use a PRNG with a bias when skipping away from...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-06 Christian Coudert6030: test skipping away from an already skipped commit
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-06 Christian Couderbisect: when skipping, choose a commit away from a...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-06 Christian Couderbisect: add parameters to "filter_skipped"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Coudert6050: check pushing something based on a replaced...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian CouderDocumentation: add documentation for "git replace"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderbuiltin-replace: use "usage_msg_opt" to give better...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderparse-options: add new function "usage_msg_opt"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderbuiltin-replace: teach "git replace" to actually replace
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian CouderAdd new "git replace" command
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderenvironment: add global variable to disable replacement
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Coudermktag: call "check_sha1_signature" with the replacement...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderreplace_object: add a test case
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderobject: call "check_sha1_signature" with the replacement...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
next
Extra changes on top of the MinGW port of git