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
Merge branch 'mz/cherry-pick-cmdline-order'
2012-08-30
Martin von Z
w
eigbergk
cherry-pick/revert:
resp
e
ct orde
r
of
r
evisions to
p
ick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
v
on
Z
weigbergk
demo
n
s
trate broke
n
'git c
h
erry-pick th
r
ee one t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigberg
k
t
e
ach log --no-wal
k
=u
n
sorted, which avoids s
o
rting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Z
w
e
igbergk
add t
e
sts for
'gi
t
rebase --keep-empt
y
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
t
i
n
v
o
n Zweigbergk
c
h
erry: re
m
ove redundant check for mer
g
e c
o
mmit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin von Zweigbergk
cherry:
don
'
t set i
g
nored rev_
i
nfo options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigbergk
remove u
n
necessary par
a
meter from g
e
t_p
a
tc
h
_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Zweig
b
er
g
k
a
d
d test case for rebase of e
m
pt
y
commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweig
b
ergk
a
m
: don't call
m
a
i
l
inf
o
if $re
b
asing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von Zweigbergk
am --rebasing:
g
et pa
t
c
h
b
o
dy from com
m
it, not
from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n Zweigbergk
rebas
e
-
-
root: pri
n
t usage o
n
t
o
o
many arg
s
commit
|
commitdiff
|
tree
2012-06-26
Marti
n
v
on Zw
e
i
g
bergk
rebase: don't source
git-sh-setup
t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
on Zweigbergk
t3401: u
s
e test
_
commit i
n
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Mar
t
in von Zwe
i
gbergk
t3401
:
modern
i
z
e
style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mar
t
in von Zweigbergk
a
m
: don
'
t p
e
rsist
k
eepcr fl
a
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zwei
g
bergk
r
emote: only upd
a
t
e
remote-tracking
b
ra
n
ch if upda
t
i
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
eigbergk
remote rename: war
n
wh
e
n refspec was no
t
up
d
a
ted
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n
v
on
Z
weigbergk
remote: "rename o foo" s
h
ould
no
t
r
ena
m
e ref
"origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remot
e
: wri
t
e correct
f
etch spec whe
n
rena
m
ing re
m
ote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Z
w
eigbe
r
gk
gitk: Sh
o
w mo
d
i
f
i
ed files with separate
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n
Zw
e
i
gbergk
g
i
tk: Sim
p
lify calculati
o
n of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Z
w
eigbergk
g
i
tk: Run 'git rev-parse --git-d
i
r' on
l
y once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
o
n Zweigbergk
gitk: Put t
e
mpo
r
ar
y
directory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zweigbergk
gitk: Fi
x
"E
x
ternal dif
f
" with separate wor
k
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweig
b
er
g
k
g
itk: Fix
"
blame parent commit" with separate wor
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zw
e
igbergk
g
i
tk:
Fix "show origi
n
o
f
thi
s
line" with
separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n
Z
weigbergk
gitk: Fix file
h
ighlight when run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweig
b
ergk
rebase: cl
a
rify "re
s
t
o
re
t
he original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin vo
n
Zwei
g
berg
k
Documentation:
us
e
[verse] for SYNOPSIS
s
e
c
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
a
rti
n
von Z
w
eigbergk
di
f
fcore-rena
m
e
: don't
c
onside
r
unmerged
p
at
h
as sou
r
ce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Z
w
eigber
g
k
r
ebas
e
:
d
efin
e
options
in OPTIO
N
S_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zwe
i
gbergk
Makefile: do not install sour
c
ed re
b
ase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on
Zweigbergk
mergetool: don't skip modify/remove
c
onflic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin v
o
n Zweigbergk
rerere
"
remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: use @{upstr
e
am} i
f
n
o
upst
r
eam speci
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
rgk
r
e
b
ase -i: remove unnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwei
g
ber
g
k
re
b
ase -i:
don't read unused variable pres
e
r
v
e_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
vo
n
Zweigbergk
git-rebase--am: remove
u
nnecessa
r
y --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigb
e
rgk
reb
a
se -m: don't print e
x
it co
d
e 2 whe
n
merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebas
e
-m:
r
e
member a
l
l
o
w
_
r
e
r
ere_auto
u
pdate o
p
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: re
m
em
b
e
r strategy
and s
t
rategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zw
e
igbergk
reba
s
e: reme
m
b
e
r verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: extract co
d
e for wr
i
t
ing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: fa
c
t
or out sub
c
ommand ha
n
dling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eigberg
k
rebase: make -v a tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igb
e
rgk
r
e
base -i: align variable name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: show consistent
conflic
t
resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von
Zweigbergk
rebase
:
extract am cod
e
to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwe
i
gberg
k
rebase: extrac
t
merge code to ne
w
s
ource fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
reba
s
e:
remove $branch as syno
n
ym for $o
r
i
g
_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebas
e
:
factor out reference
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigber
g
k
rebase -i: support -
-
stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Z
w
eigbergk
rebase: reorder v
a
lidation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
e
i
gbergk
rebase:
f
actor out
cal
l
to
pre-rebase ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
weigbergk
re
b
ase -i
:
remove n
o
w un
n
ec
e
s
s
ary
dir
e
ct
o
ry che
c
ks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
e
igbergk
rebase: f
a
ctor out
clean
wo
r
k
tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
r
ebase: factor out co
m
mand line op
t
i
o
n
processin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwei
g
bergk
rebase: align
varia
b
le content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
wei
g
bergk
rebase: align
variable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
r
ebase: str
i
cter che
c
k o
f
stand
a
lon
e
sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigberg
k
rebase:
a
ct on command line
o
utside parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigbergk
rebase: impro
v
e
d
etecti
o
n o
f
rebase in progr
e
ss
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zwe
i
gbergk
rebase: r
e
move
u
nused
rebase s
t
ate 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
erg
k
r
e
base: read
s
tate outside
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigberg
k
rebas
e
: refactor reading of
s
t
a
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbe
r
gk
rebase: clearer names
f
o
r dire
c
tory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
ar
t
in von Zweigbergk
c
o
mpletion: add missing configuration variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zwe
i
gbergk
Use
r
eflog
i
n
'
pull --rebas
e
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zwei
g
be
r
gk
r
e
base: only show stat if configured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
artin von
Zweigbergk
rebase --abort: do not update b
r
an
c
h ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
rebase: support --
v
erify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
tin vo
n
Z
w
e
igberg
k
D
ocumen
t
ation/git-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin v
o
n Zwei
g
bergk
rebase -X: do not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree