| 2013-06-07 | tests: move test for rebase messages from t3400 to... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-06-07 | t3406: modernize style Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-06-07 | add tests for rebasing merged history Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-06-07 | add tests for rebasing root Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-06-07 | add tests for rebasing of empty commits Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-06-07 | add tests for rebasing with patch-equivalence present Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-06-07 | add simple tests of consistency across rebase types Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-16 | reset: update documentation to require only tree-ish... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset [--mixed]: use diff-based reset whether or not... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset: allow reset on unborn branch Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset $sha1 $pathspec: require $sha1 only to be treeish Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: inline update_index_refresh() Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: finish entire cmd_reset() whether or not pathspec... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset [--mixed]: only write index file once Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: move lock, write and commit out of update_index_ref... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: move update_index_refresh() call out of read_from_t... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: replace switch by if-else Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset: avoid redundant error message Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset --keep: only write index file once Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: share call to die_if_unmerged_cache() Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: extract function for updating {ORIG_,}HEAD Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: remove unnecessary variable 'i' Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: extract function for parsing arguments Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset: don't allow "git reset -- $pathspec" in bare... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset.c: pass pathspec around instead of (prefix, argv... Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset $pathspec: exit with code 0 if successful Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2013-01-15 | reset $pathspec: no need to discard index Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-12-23 | learn to pick/revert into unborn branch Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-12-23 | tests: move test_cmp_rev to test-lib-functions Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-12-20 | oneway_merge(): only lstat() when told to update worktree Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-09-18 | rebase usage: subcommands can not be combined with -i Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-08-30 | cherry-pick/revert: respect order of revisions to pick Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-08-30 | demonstrate broken 'git cherry-pick three one two' Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-08-30 | teach log --no-walk=unsorted, which avoids sorting Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> |
diff | tree |
| 2012-08-09 | add tests for 'git rebase --keep-empty' Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2012-07-30 | cherry: remove redundant check for merge commit Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2012-07-30 | cherry: don't set ignored rev_info options Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2012-07-29 | remove unnecessary parameter from get_patch_ids() Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2012-06-27 | add test case for rebase of empty commit |
diff | tree |
| 2012-06-26 | am: don't call mailinfo if $rebasing Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2012-06-26 | am --rebasing: get patch body from commit, not from... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2012-06-26 | rebase --root: print usage on too many args |
diff | tree |
| 2012-06-26 | rebase: don't source git-sh-setup twice |
diff | tree |
| 2011-12-12 | t3401: use test_commit in setup Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-12-12 | t3401: modernize style Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-12-09 | am: don't persist keepcr flag Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-09-12 | remote: only update remote-tracking branch if updating... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-09-12 | remote rename: warn when refspec was not updated Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-09-12 | remote: "rename o foo" should not rename ref "origin... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-09-12 | remote: write correct fetch spec when renaming remote... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Show modified files with separate work tree Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Simplify calculation of gitdir Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Run 'git rev-parse --git-dir' only once Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Put temporary directory inside .git Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Fix "External diff" with separate work tree Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Fix "blame parent commit" with separate work... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Fix "show origin of this line" with separate... Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-24 | gitk: Fix file highlight when run in subdirectory Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-14 | rebase: clarify "restore the original branch" Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-07-06 | Documentation: use [verse] for SYNOPSIS sections Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-03-24 | diffcore-rename: don't consider unmerged path as source Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-03-05 | rebase: define options in OPTIONS_SPEC Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-25 | Makefile: do not install sourced rebase scripts Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-16 | mergetool: don't skip modify/remove conflicts Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-16 | rerere "remaining" Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: use @{upstream} if no upstream specified Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -i: remove unnecessary state rebase-root Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -i: don't read unused variable preserve_merges Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | git-rebase--am: remove unnecessary --3way option Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -m: don't print exit code 2 when merge fails Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -m: remember allow_rerere_autoupdate option Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: remember strategy and strategy options Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: remember verbose option Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: extract code for writing basic state Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: factor out sub command handling Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: make -v a tiny bit more verbose Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -i: align variable names Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: show consistent conflict resolution hint Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: extract am code to new source file Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: extract merge code to new source file Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: remove $branch as synonym for $orig_head Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: factor out reference parsing Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -i: support --stat Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: reorder validation steps Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: factor out call to pre-rebase hook Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase -i: remove now unnecessary directory checks Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: factor out clean work tree check Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: factor out command line option processing Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: align variable content Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: align variable names Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: stricter check of standalone sub command Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: act on command line outside parsing loop Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: improve detection of rebase in progress Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: remove unused rebase state 'prev_head' Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: read state outside loop Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: refactor reading of state Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2011-02-10 | rebase: clearer names for directory variables Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2010-12-21 | completion: add missing configuration variables Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2010-11-29 | Use reflog in 'pull --rebase . foo' Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |
| 2010-11-29 | rebase: only show stat if configured to true Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail... |
diff | tree |