index
:
tgif.git
2.36
Terin's Improved Git Fork
terinjokes@gmail.com
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
git-rebase.sh
Age
Commit message (
Expand
)
Author
Files
Lines
2006-12-28
Use branch names in 'git-rebase -m' conflict hunks.
Shawn O. Pearce
1
-1
/
+10
2006-12-28
Use GIT_REFLOG_ACTION environment variable instead.
Shawn O. Pearce
1
-6
/
+4
2006-12-22
merge and reset: adjust for "reset --hard" messages
Junio C Hamano
1
-0
/
+1
2006-12-09
rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
Eric Wong
1
-0
/
+8
2006-11-21
remove merge-recursive-old
Junio C Hamano
1
-9
/
+0
2006-10-04
git-rebase: Add a -v option to show a diffstat of the changes upstream at the...
Robert Shearman
1
-1
/
+11
2006-10-04
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
Robert Shearman
1
-1
/
+1
2006-09-24
Deprecate merge-recursive.py
Junio C Hamano
1
-15
/
+4
2006-08-12
Merge branch 'master' into js/c-merge-recursive
Junio C Hamano
1
-9
/
+6
2006-07-31
rebase: Make the fast-fowarding message more user-friendly by using branch na...
Robert Shearman
1
-1
/
+1
2006-07-31
rebase: Fix the detection of fast-forwarding of the current branch to upstream.
Robert Shearman
1
-8
/
+5
2006-07-30
Merge branch 'js/read-tree' into js/c-merge-recursive
Junio C Hamano
1
-3
/
+6
2006-07-13
recur vs recursive: help testing without touching too many stuff.
Junio C Hamano
1
-2
/
+13
2006-07-13
Status update on merge-recursive in C
Johannes Schindelin
1
-2
/
+2
2006-07-13
Record rebase changes as 'rebase' in the reflog.
Shawn Pearce
1
-3
/
+6
2006-07-08
Using 'perl' in *.sh
Michal Rokos
1
-1
/
+1
2006-06-28
rebase: check for errors from git-commit
Eric Wong
1
-1
/
+6
2006-06-28
rebase: get rid of outdated MRESOLVEMSG
Eric Wong
1
-8
/
+3
2006-06-27
Fix expr usage for FreeBSD
Dennis Stosberg
1
-1
/
+1
2006-06-25
rebase: allow --skip to work with --merge
Eric Wong
1
-1
/
+12
2006-06-25
rebase: cleanup rebasing with --merge
Eric Wong
1
-28
/
+5
2006-06-25
rebase: allow --merge option to handle patches merged upstream
Eric Wong
1
-4
/
+11
2006-06-22
rebase --merge: fix for rebasing more than 7 commits.
Junio C Hamano
1
-13
/
+10
2006-06-21
rebase: error out for NO_PYTHON if they use recursive merge
Eric Wong
1
-0
/
+9
2006-06-21
rebase: Allow merge strategies to be used when rebasing
Eric Wong
1
-9
/
+183
2006-05-21
git-rebase: use canonical A..B syntax to format-patch
Junio C Hamano
1
-1
/
+1
2006-05-14
Make git rebase interactive help match documentation.
Sean
1
-5
/
+16
2006-04-26
Add --continue and --abort options to git-rebase.
sean
1
-24
/
+38
2006-04-26
rebase: typofix.
Junio C Hamano
1
-1
/
+1
2006-04-13
Shell utilities: Guard against expr' magic tokens.
Mark Wooding
1
-1
/
+1
2006-02-21
Fix typo in git-rebase.sh.
Jason Riedy
1
-1
/
+1
2006-02-21
git-rebase: Clarify usage statement and copy it into the actual documentation.
Carl Worth
1
-10
/
+14
2006-02-18
Merge branch 'jc/rebase-limit'
Junio C Hamano
1
-18
/
+71
2006-02-14
rebase: allow rebasing onto different base.
Junio C Hamano
1
-18
/
+71
2006-02-13
rebase: allow a hook to refuse rebasing.
Junio C Hamano
1
-0
/
+9
2005-12-14
Bugfixes for git-rebase
Lukas Sandström
1
-11
/
+18
2005-12-14
rebase: do not get confused in fast-forward situation.
Junio C Hamano
1
-0
/
+3
2005-12-14
git-rebase: Usage string clean-up, emit usage string at incorrect invocation
freku045@student.liu.se
1
-2
/
+3
2005-11-28
rebase: one safety net, one bugfix and one optimization.
Junio C Hamano
1
-1
/
+27
2005-11-25
git-sh-setup: die if outside git repository.
Junio C Hamano
1
-1
/
+1
2005-11-18
Rewrite rebase to use git-format-patch piped to git-am.
Junio C Hamano
1
-56
/
+16
2005-09-28
Use git-update-ref in scripts.
Junio C Hamano
1
-2
/
+3
2005-09-07
Big tool rename.
Junio C Hamano
1
-0
/
+68