repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -i: Add tests for "--edit-todo"
2012-09-18
M
a
rtin von Zweigbergk
rebase usage: subco
m
mands can n
o
t
b
e combi
n
ed with
-
i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
von Zweigber
g
k
cherry-pick/revert: r
e
spect order of revisions t
o
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin v
o
n Zwe
i
g
berg
k
de
m
onstrate bro
k
en
'git cherry-pick three o
n
e two
'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
teach log --no-wa
l
k=
u
nsorted, whic
h
avoids so
r
ting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweigbe
r
gk
a
dd tests f
o
r
'gi
t
rebase --keep-empty
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigber
g
k
cherry: remove redundant check for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin v
o
n Z
w
eig
b
ergk
cherry: d
o
n't set ignored
rev_i
n
fo
o
p
t
io
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin
v
o
n Zweigb
e
rgk
rem
o
v
e
unnec
e
ssary paramet
e
r f
r
om
g
et_patch_id
s
()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin vo
n
Zw
e
igbergk
add test
case for rebase of em
p
ty commi
t
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am: don't
call m
a
ilinf
o
i
f
$rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in von Zweigbergk
am -
-
rebasing: ge
t
patch body from commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
von Zweig
b
erg
k
rebas
e
--root: print usage on too many args
commit
|
commitdiff
|
tree
2012-06-26
M
artin
v
on Zwe
i
gbergk
rebase: don'
t
s
o
urce git
-
sh-se
t
up twice
commit
|
commitdiff
|
tree
2011-12-12
M
a
rtin von Zweigb
e
r
gk
t3401:
u
se test_commi
t
in
s
etup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n von Zweigbergk
t
3
4
01:
m
o
dernize
sty
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
artin von Zwe
i
gbergk
am: d
o
n't persist keepcr fl
a
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin
von Zweigbergk
remo
t
e:
only
upd
a
t
e
remote-tracking branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
eigbergk
r
e
mote rename
:
w
arn when refs
p
ec was not upd
a
ted
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von
Z
wei
g
b
e
r
g
k
remot
e
:
"
rena
m
e o foo" shoul
d
n
ot rename ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
artin von
Z
weigbergk
r
emot
e
: wri
t
e correc
t
fetch spec w
h
en renamin
g
remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Z
w
eigbergk
gitk: Show modified files wit
h
sep
a
r
a
te
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
git
k
: Simplify calculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
vo
n
Zweigbergk
gitk: Run
'
g
i
t rev-parse --gi
t
-dir'
only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwe
i
gbergk
g
itk: Put t
e
mpo
r
ary dire
c
tory in
s
ide
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
vo
n
Z
w
eigbergk
gitk: Fix "
E
xternal diff
"
wi
t
h s
e
pa
r
ate
wo
r
k tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
i
tk: Fi
x
"b
l
ame pa
r
ent commit" wit
h
s
e
parate
w
ork
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n
Z
w
e
igbergk
g
itk: Fi
x
"show or
i
gin of this lin
e
" with separ
a
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigberg
k
gitk: Fix file hig
h
li
g
ht when run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin vo
n
Z
weigberg
k
r
e
base: clarify
"restore t
h
e original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin
von Zweigbergk
Documentation:
u
se [ve
r
s
e
] for
SYNOP
S
I
S
sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin
v
on Z
w
ei
g
berg
k
diffcore-
r
ename: don'
t
c
onsid
e
r unm
e
rged path as so
u
rce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
r
t
i
n
von Zwe
i
gbergk
rebase
:
defin
e
options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
a
rt
i
n von Zweigbe
r
g
k
Makefile:
d
o not instal
l
sourced rebase script
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zweigbe
r
gk
merge
t
ool:
d
on't s
k
ip mo
d
i
f
y/remov
e
conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zw
e
igbergk
rerere "re
m
ainin
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zwe
i
gb
e
r
gk
rebase: use @{upstream} i
f
no upst
r
eam specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase -
i
: rem
o
ve unnecessary sta
t
e
rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eig
b
e
rgk
reb
a
se -i: don't read unused variable preser
v
e
_
merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
b
e
r
gk
git-rebase--am: remove unnecessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m:
d
on't p
r
int exit code
2 when me
r
ge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von
Zwei
g
bergk
reb
a
se -m: remember allow_rerere_autoupdate
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweig
b
ergk
rebase: reme
m
ber strategy and strategy opt
i
on
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebas
e
: reme
m
ber verbose o
p
t
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: ex
t
ract code for writing b
a
sic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebas
e
: factor
o
u
t sub command handli
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zwei
g
bergk
rebas
e
: make
-v a
tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zwei
g
be
r
gk
rebase -i:
align variab
l
e names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: show consis
t
ent conf
l
i
ct resolut
i
on hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase:
e
x
t
ract am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigberg
k
rebas
e
: extra
c
t merge co
d
e to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igb
e
rgk
rebase
:
remove $branch as synony
m
f
o
r
$ori
g
_h
e
ad
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbergk
rebase: facto
r
out ref
e
rence parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i
:
support
-
-stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
e
igbergk
rebase: re
o
r
d
er va
l
idation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zwei
g
be
r
gk
rebase: fa
c
tor out
c
all t
o
pre-reb
a
se
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigber
g
k
r
e
base
-i: remove
n
o
w
u
nnecessary
d
irectory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out clean wo
r
k
t
ree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase:
f
a
ctor out command line option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
on Zweigberg
k
rebase: align var
i
able content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwei
g
b
e
r
g
k
rebas
e
:
a
lign variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zwei
g
b
ergk
rebase: s
t
r
i
cter chec
k
of st
a
n
d
a
l
o
n
e sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zwe
i
gbe
r
gk
rebas
e
: act on command li
n
e outside p
a
r
s
in
g
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigber
g
k
rebase: improve detection of re
b
ase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: remove unuse
d
reb
a
se state 'pr
e
v
_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbe
r
g
k
rebase:
r
ead state
o
utside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
reb
a
s
e: refactor rea
d
in
g
of stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
reb
a
se: clearer names for directory vari
a
b
les
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigber
g
k
c
om
p
l
et
i
on
:
add missing con
f
igura
t
ion v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Marti
n
von Zweigbergk
Use reflog in 'pull
--re
b
ase
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
artin von Zweigbergk
rebase: only
s
ho
w
st
a
t
i
f
c
o
n
figured to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin
v
on
Z
weigb
e
rg
k
rebase -
-
a
b
or
t
: do
not update branch
r
ef
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von Z
w
eigbergk
rebase: support --ve
r
i
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von
Zweigbergk
Docume
n
tation/git-pull:
c
larify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zwe
i
gbergk
rebase
-
X: do not
c
lobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree