repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: mention `push.default` in git-push.txt
2012-09-18
Ma
r
t
i
n v
o
n
Z
w
eigber
g
k
re
b
ase
u
sage: su
b
commands ca
n
not be combined with
-
i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in von Zweigbergk
cherry-pi
c
k/
r
e
vert: respect orde
r
o
f
revisions to pi
c
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rt
i
n von Zw
e
igbergk
demonstrate
b
roken '
g
i
t c
h
erry-pick three
o
n
e
t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n
Z
we
i
gbergk
tea
c
h
log
--no-walk=unsorted, which
a
voi
d
s sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Marti
n
von Zw
e
ig
b
e
r
g
k
a
dd tests for '
g
it reba
s
e --kee
p
-e
m
pty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin vo
n
Zweigberg
k
cherry: remove redundant
che
c
k
fo
r
m
e
rg
e
commi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin v
o
n Zweigbergk
ch
e
rry: d
o
n't set
igno
r
ed rev_info opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
artin von Zweig
b
ergk
remove unnecessary para
m
eter from
g
et
_
patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Ma
r
tin v
o
n Zweigbergk
add tes
t
cas
e
for rebase of empty commit
commit
|
commitdiff
|
tree
2012-06-26
M
artin
von Zweigbe
r
gk
am: don't
call mailinf
o
if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
i
n von Z
w
eigbergk
am
--rebasing: g
e
t patch body fr
o
m commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Zweigber
g
k
reba
s
e --root:
print usage on to
o
many
a
rgs
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigberg
k
r
eb
a
se: don't source
git-sh
-
setu
p
t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t
3
401
:
use
t
est_commit in
s
etup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Ma
r
tin von
Z
weigbergk
t3401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Ma
r
tin von Zw
e
igbergk
am: don't pers
i
st keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin
von Zweigbergk
remote:
only
update remote-tr
a
c
k
ing branch if updat
i
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Zw
e
ig
b
erg
k
r
e
mote rename: warn
w
hen refspec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
weigbe
r
gk
r
e
mo
t
e:
"rename
o
f
o
o" should not ren
a
m
e
r
ef "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweigbe
r
gk
remo
t
e:
wri
t
e corr
e
ct fetch spec when re
n
aming rem
o
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
b
e
rgk
gitk: Show modified
files
with sep
a
rate work
t
ree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
tin
von Zweigbergk
gitk
:
Simpl
i
fy c
a
l
c
u
l
at
i
on of gitdi
r
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
gitk: Run 'git rev-parse -
-
gi
t
-dir
'
only
o
nce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
g
k
gitk: Put temporary dir
e
ctory ins
i
de
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbergk
gitk:
F
ix "External diff" wit
h
separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigber
g
k
git
k
: Fix "bla
m
e p
a
rent
c
ommit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbergk
g
i
tk: F
i
x "show
origin of
this
lin
e
" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweigb
e
rgk
g
i
t
k:
F
ix file h
i
ghlight
w
hen ru
n
in sub
d
irectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbe
r
gk
reba
s
e: clarify "restore the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweig
b
er
g
k
Do
c
ument
a
tio
n
: use
[v
e
rse
]
for SYNOPS
I
S sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
diffcor
e
-re
n
ame: don't c
o
n
sid
e
r unmerg
e
d path
a
s source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin vo
n
Z
w
eigb
e
rgk
rebase: d
e
fi
n
e op
t
ions in O
P
T
IONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von
Zweigb
e
rgk
Makefi
l
e: d
o
n
o
t instal
l
sourced rebase sc
r
ipts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
mergetool: don'
t
s
k
ip modi
f
y/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Marti
n
von Zwei
g
b
e
r
g
k
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: use @{upstream} if
no upstream
specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
rebase -i
:
remo
v
e
unnecessa
r
y st
a
t
e
rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
rebase -i:
d
on't read unused variable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
g
i
t-rebase--
a
m: remove unnecessary --3way o
p
t
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigb
e
r
gk
rebase -m: don't print exit co
d
e 2 wh
e
n me
r
g
e
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eigbergk
rebase -m:
rem
e
mber a
l
l
ow
_
rerere_aut
o
u
pdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwei
g
bergk
rebase: remember strategy and strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
v
on
Zwe
i
g
b
e
rgk
rebase:
r
e
m
ember ve
r
bose opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
w
eigberg
k
r
ebase:
extract code for writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zweigbergk
rebase:
factor
o
ut sub command han
d
ling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zwe
i
gbergk
reba
s
e: make -v
a
tiny bit
more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbe
r
g
k
rebase -
i
: align variable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
bergk
re
b
a
s
e: show consistent conflict re
s
olut
i
on hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
r
e
ba
s
e: extract am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: ex
t
ract merg
e
c
ode to new so
u
rce fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
ergk
rebase: remove $branch a
s
s
ynonym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigb
e
r
gk
reb
a
s
e
: fa
c
tor out re
f
er
e
n
ce pa
r
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbe
r
g
k
rebase -i: sup
p
or
t
--sta
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
g
b
e
rgk
r
e
base: reorder
validatio
n
s
t
eps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweig
b
er
g
k
re
b
ase:
factor out call to
pre-rebas
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
rebase -i: re
m
ove now un
n
ec
e
ssary
d
i
rectory chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigberg
k
rebas
e
: factor out clean
work
t
ree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase: facto
r
out c
o
m
m
and line option pr
o
c
essing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von Z
w
ei
g
bergk
r
e
base
:
align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n
Zweigbergk
reb
a
se: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
st
r
i
cter
c
he
c
k of standalone sub
c
omman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zwe
i
g
b
ergk
r
ebase: act on command line outside par
s
ing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
o
n
Zweigbergk
rebase: improve det
e
ction
of reba
s
e in p
r
ogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
a
s
e
:
r
e
move unused r
e
base st
a
t
e 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
base: read st
a
te
outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Z
w
eigbergk
rebase: refactor
r
e
ading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: clearer
n
ames for directo
r
y v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
tin von Zweigbergk
complet
i
on: ad
d
missing confi
g
uration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
Use reflog in 'pull
-
-rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweig
b
ergk
rebase: only show stat
if conf
i
g
u
red to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbergk
rebase --ab
o
rt: do not update bran
c
h ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von Zweigbergk
rebase: support
-
-
v
e
rify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in von Zweigber
g
k
D
o
c
umentation/git-pull: clarify
c
o
nfig
u
r
ation
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von Zweigbergk
rebase -
X
:
do not c
l
obber s
t
rateg
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree