?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Merge branch 'maint'
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
2009-06-01 Christian Coudersha1_file: add a "read_sha1_file_repl" function
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderreplace_object: add mechanism to replace objects found...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-06-01 Christian Couderrefs: add a "for_each_replace_ref" function
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-29 Christian Couderbisect: display first bad commit without forking a...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-27 Christian Couderbisect: drop unparse_commit() and use clear_commit_marks()
 commit | commitdiff | tree
2009-05-18 Christian Couderbisect: check ancestors without forking a "git rev...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-18 Christian Coudercommit: add function to unparse a commit and its parents
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-18 Christian Couderbisect: rework some rev related functions to make them...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: make "git bisect" use new "--next-all" bisect...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: add "check_good_are_ancestors_of_bad" function
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: implement the "check_merge_bases" function
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: automatically sort sha1_array if needed when...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: make skipped array functions more generic
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: remove too much function nesting
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: use new "struct argv_array" to prepare argv...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: store good revisions in a "sha1_array"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: implement "rev_argv_push" to fill an argv with...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: use "sha1_array" to store skipped revisions
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderam: simplify "sq" function by using "git rev-parse...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: use "git rev-parse --sq-quote" instead of a...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderrev-parse: add --sq-quote to shell quote arguments
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderrev-list: remove stringed output flag from "show_bisect_vars"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect--helper: remove "--next-vars" option as it is...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: use "git bisect--helper --next-exit" in "git...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect--helper: add "--next-exit" to output bisect...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderbisect: move common bisect functionality to "bisect_common"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderrev-list: refactor printing bisect vars
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-05-10 Christian Couderrev-list: make "estimate_bisect_steps" non static
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-08 Christian Couderrev-list: add "int bisect_show_flags" in "struct rev_list_info"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-08 Christian Couderrev-list: remove last static vars used in "show_commit"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-08 Christian Couderlist-objects: add "void *data" parameter to show functions
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderbisect--helper: string output variables together with...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderrev-list: pass "int flags" as last argument of "show_bisect_...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Coudert6030: test bisecting with paths
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderbisect: use "bisect--helper" and remove "filter_skipped...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderbisect: implement "read_bisect_paths" to read paths...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderbisect--helper: implement "git bisect--helper"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderbisect: use the new generic "sha1_pos" function to...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderrev-list: call new "filter_skip" function
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderbisect: improve error message when branch checkout...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Couderpatch-ids: use the new generic "sha1_pos" function...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-04-05 Christian Coudersha1-lookup: add new "sha1_pos" function to efficiently...
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
2009-03-30 Christian Couderrev-list: pass "revs" to "show_bisect_vars"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
 commit | commitdiff | tree
next
Jonathan Nieder’s miscellaneous git branches