koreno / prebase Goto Github PK
View Code? Open in Web Editor NEWa more informative 'git rebase --interactive'
a more informative 'git rebase --interactive'
When using this great tool, it occurred to me it might be easier to reason about file changes, specially files that have been renamed, if the list was presented alphabetically. Also, the fact that the folder structures flatten themselves nicely (files located "near" each other will be "near" in the list) is pretty helpful.
Commit ef611ed has broken git-prebase on my machine. The 'pick' lines get shown twice in the output, and git then tries to cherry pick each commit twice.
I'm on OSX 10.11, with python 2.7.11 and git 2.7.4.
Here's the output I get if I run git prebase HEAD~5
on the prebase repository. Lines 12-16 ought not to be there.
1 pick a2df8ed 1:Converted to a github project, renamed to 'prebase' 0123_
2 pick ca8150a 2:make executable 0____
3 pick 19dcc59 3:show usage on invalid cmd-line args (#1) 0____
4 pick 20fc8f3 4:support for soring file list by name: -F, --sort-file-list (#2) 0____
5 pick ef611ed 5:Added python 2.6+ compatibility 0____
6
7 # [0] git-prebase 0____
8 # [1] README.md _1___
9 # [2] example __2__
10 # [3] rebaser.py ___3_
11
12 pick a2df8ed Converted to a github project, renamed to 'prebase'
13 pick ca8150a make executable
14 pick 19dcc59 show usage on invalid cmd-line args (#1)
15 pick 20fc8f3 support for soring file list by name: -F, --sort-file-list (#2)
16 pick ef611ed Added python 2.6+ compatibility
17
18 # Rebase 800ed2f..f2eb7fa onto 800ed2f (5 command(s))
19 #
20 # Commands:
21 # p, pick = use commit
22 # r, reword = use commit, but edit the commit message
23 # e, edit = use commit, but stop for amending
24 # s, squash = use commit, but meld into previous commit
25 # f, fixup = like "squash", but discard this commit's log message
26 # x, exec = run command (the rest of the line) using shell
27 # d, drop = remove commit
28 #
29 # These lines can be re-ordered; they are executed from top to bottom.
30 #
31 # If you remove a line here THAT COMMIT WILL BE LOST.
32 #
33 # However, if you remove everything, the rebase will be aborted.
34 #
35 # Note that empty commits are commented out
When calling prebase such as git prebase -i master
, one is presented with the error message
Traceback (most recent call last):
File "/usr/local/bin/git-prebase", line 104, in <module>
commits.append(line.split()[1])
IndexError: list index out of range
Could not execute editor
While it is not correct usage to pass in a -i
parameter, it'd be cool to have a friendlier error message.
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.