repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.8.0-rc0
2012-09-18
M
a
rtin vo
n
Zwei
g
be
r
gk
rebase usage: su
b
comman
d
s can not be combined
w
ith -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in v
o
n Z
w
e
igbergk
cherry-pick/r
e
vert: respect order
of revisions
t
o
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rtin v
o
n Zweigbe
r
gk
demonstrate broke
n
'git cherry-pick th
r
ee one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweig
b
er
g
k
te
a
ch log --no-walk=
u
nsorted, whic
h
avoids s
o
rting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweig
b
ergk
a
dd test
s
f
o
r 'git rebase --keep-emp
t
y'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mar
t
i
n
von Zweigbe
r
gk
c
h
erry:
r
emove r
e
d
undant check
f
o
r
m
er
g
e commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
v
o
n
Z
weigbergk
cherry:
d
on't set ignored
rev_info opti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Ma
r
tin von Zweigb
e
r
g
k
remove unnec
e
ssary parameter
f
rom get_p
a
tch_id
s
()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zweigberg
k
add test case for re
b
ase of
e
mpt
y
comm
i
t
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zwei
g
b
e
r
gk
am: don't call mailin
f
o if
$rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am
-
-
r
ebas
i
ng: get patch
b
ody fro
m
comm
i
t, not
f
rom
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
o
n Zwe
i
gbergk
rebase --root
:
p
rint
u
sage on too many
a
rgs
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Z
w
e
ig
b
ergk
r
ebase
:
do
n
't source
g
it-sh-
s
etup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
o
n Zw
e
igbergk
t3
4
01: us
e
t
e
st_commit
i
n
s
etup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zw
e
igbergk
t3
4
01: m
o
dernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Ma
r
tin von Zwei
g
bergk
am:
d
on't per
s
ist kee
p
c
r
flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zwe
i
g
bergk
remote:
o
nly
u
pdate remote-tracking br
a
nch if u
p
dating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote re
n
ame: warn when refs
p
e
c was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwe
i
gbergk
re
m
ote: "rename o foo" shoul
d
not rename ref "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zweigbergk
rem
o
t
e
: write co
r
rect fetch spec when renaming
r
emo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n Zweigbergk
g
itk:
Show modified files with separate work
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
gitk: Simplify cal
c
ulation of gi
t
dir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Z
w
eig
b
ergk
g
i
tk: Run
'
git re
v
-parse --git-dir' only on
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Put tempo
r
ar
y
directory ins
i
de
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rt
i
n von Zw
e
i
gbergk
gitk: Fix "
E
xternal diff" with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von
Z
wei
g
bergk
gi
t
k: Fix "blame paren
t
commit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigber
g
k
gitk:
F
ix "show
o
rigin of this
l
ine" with s
e
pa
r
a
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
i
tk: Fix file
h
ighl
i
ght when run in subd
i
rectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin v
o
n Zweigbergk
reb
a
s
e: cl
a
rify "restor
e
the origi
n
al branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Z
w
eigbergk
Documen
t
ation: us
e
[
v
erse] for
S
YN
O
P
SIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zwei
g
b
e
rg
k
diff
c
ore-rename: don't
c
o
n
sider unmer
g
ed p
a
th as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin vo
n
Zwei
g
bergk
rebase: define opt
i
ons in OPT
I
ONS
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
tin vo
n
Zweigbergk
Make
f
ile: do not install so
u
rc
e
d reba
s
e scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n von Zweigbergk
mergetool: don't skip
modify/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zw
e
i
gberg
k
rer
e
r
e
"r
e
maining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
erg
k
reb
a
s
e
: use
@
{upstream} if no ups
t
ream spe
c
i
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-
i: remov
e
unneces
s
a
r
y s
t
ate r
e
ba
s
e-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
a
s
e
-
i: don't read un
u
s
e
d va
r
iable preserv
e
_
m
erges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zweigbergk
git-re
b
a
s
e
-
-am: remove unnecessary --3way
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von
Zweig
b
erg
k
rebase -m: do
n
't prin
t
exit
c
ode 2 when merg
e
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rg
k
rebase
-
m: r
e
member allow_re
r
ere_
a
utoupdat
e
o
p
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
reb
a
s
e
:
r
emember s
t
rategy and
s
trategy
opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: reme
m
ber
verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwei
g
bergk
rebase: extract code fo
r
wr
i
ting ba
s
ic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
r
ebase: f
a
ctor
o
ut sub
c
ommand handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: ma
k
e -v a ti
n
y
b
i
t
more
v
e
r
b
o
se
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zw
e
i
g
b
e
r
g
k
r
e
base -i:
align var
i
able names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on
Z
weigbergk
rebas
e
: show
cons
i
stent conflict r
e
s
o
lution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigbe
r
gk
rebas
e
:
extr
a
ct am
c
ode t
o
new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
gbergk
rebase: extrac
t
merge code to n
e
w source fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweigbergk
r
e
base: re
m
o
ve $branch as
s
yno
n
ym for $orig
_
he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n
Z
wei
g
bergk
reba
s
e: factor out r
e
fer
e
n
c
e pars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase -i:
support --
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
reba
s
e: reorder val
i
d
ation s
t
eps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Zwe
i
gbergk
r
e
base
:
fa
c
t
o
r out call to
pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweig
b
erg
k
reb
a
se -i: rem
o
ve now unnecess
a
ry directory check
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
reba
s
e: fa
c
tor o
u
t
c
l
e
an w
o
rk tree
c
heck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwe
i
gbergk
rebase:
f
actor ou
t
command line o
p
tion
processi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
ba
s
e: ali
g
n
v
ariable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zweigb
e
r
gk
rebase
:
align variab
l
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: stricter c
h
eck
of standalon
e
su
b
comma
n
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: act on command line o
u
tside
parsin
g
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
v
on Zweigbergk
reba
s
e:
improve detection of rebase
in progre
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: remo
v
e un
u
s
e
d
r
e
b
ase st
a
te 'pr
e
v_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von
Zweigbergk
r
ebase
:
read
sta
t
e
o
utside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
gk
rebase: refactor
reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
rebase: clea
r
er names for d
i
rectory variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbergk
c
o
m
p
l
eti
o
n: a
d
d
miss
i
ng configura
t
i
on va
r
iab
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n von Zweigb
e
rgk
Use ref
l
og i
n
'pull
-
-rebas
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zwei
g
bergk
r
e
b
ase: only show stat if configured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Ma
r
t
in von
Z
weigberg
k
r
ebase --ab
o
rt: do not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mar
t
in von Zweigb
e
r
gk
reb
a
se: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
t
i
n von Zw
e
i
g
b
er
g
k
Documentation/gi
t
-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von
Zweigb
e
rgk
rebase -X: do
not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree