repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
reset $pathspec: exit with code 0 if successful
2013-01-15
Martin v
o
n Zweigber
g
k
reset $pathspec: exit wit
h
cod
e
0 if successful
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin
v
on Zweig
b
ergk
reset $path
s
pec: no
n
eed to disca
r
d
index
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Ma
r
tin von Zw
e
igbergk
on
e
w
a
y_
m
erge(): only
lst
a
t() w
h
en told to upd
a
te worktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von Zweigber
g
k
rebase
usage: subcommands can
n
ot be
c
omb
i
ned with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n Zweigb
e
rgk
cherr
y
-pick/
r
ever
t
: respect order of revisions t
o
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in von Zw
e
igbergk
demonstrate b
r
oken
'g
i
t ch
e
rr
y
-pick
three one t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
i
n von Zweigb
e
rgk
teach
l
o
g
--no-
w
al
k
=unsorted,
w
h
ich avo
i
ds s
o
rting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweigb
e
rgk
add tests for 'git rebase
-
-
k
e
ep
-
empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
tin von Zweigbe
r
g
k
cherry: r
e
move redundant check for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigb
e
rgk
cher
r
y: don't set ignor
e
d rev_
i
nf
o
opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
a
rtin von Z
w
eigbergk
r
emov
e
unnecessa
r
y parame
t
e
r
from ge
t
_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin
von Zweigbergk
add test c
a
se for rebase of
empty c
o
mmit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbe
r
gk
a
m
: d
o
n't call mailinfo
if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zw
e
igber
g
k
am
-
-
rebasing: get patch body
f
r
o
m
commit, not
f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on
Z
weigbe
r
gk
rebase --
r
oot: pri
n
t usa
g
e on too ma
n
y
a
r
gs
commit
|
commitdiff
|
tree
2012-06-26
M
artin von Zweig
b
ergk
rebase
:
don
'
t source git-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t3401
:
use test_commit
in
s
etu
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
M
a
rtin von Zweigbergk
t340
1
:
moder
n
ize st
y
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von
Z
w
ei
g
bergk
am: don'
t
p
ersist
keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
o
n
Zweigbergk
remote: only up
d
a
te re
m
ote-tr
a
cking branch if upda
t
ing
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zwei
g
bergk
remote rename:
warn wh
e
n refspec was
n
ot updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
e
i
g
ber
g
k
r
e
mote: "rena
m
e o foo" shoul
d
not
rename re
f
"or
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von Zweig
b
ergk
remote: wr
i
te
correct fet
c
h
s
p
ec when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zwei
g
bergk
g
i
tk: Show modifi
e
d files w
i
t
h
s
e
par
a
te work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbe
r
gk
gitk:
S
im
p
lify cal
c
ulation
o
f
gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
gi
t
k: Run 'gi
t
rev-par
s
e -
-
git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbergk
g
itk: P
u
t t
e
mpo
r
ary di
r
ectory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n
Z
w
eig
b
ergk
gitk:
Fix "Exter
n
al diff" with sep
a
rate wo
r
k tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigbergk
gitk:
F
ix "
b
l
a
m
e
parent commi
t
" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
gitk: Fix "sh
o
w origi
n
of this line" with separ
a
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbergk
gitk: Fix file h
i
g
hl
i
ght
w
h
e
n run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbe
r
gk
rebase
:
clarify "rest
o
re t
h
e origi
n
a
l
bra
n
ch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zw
e
igber
g
k
Docum
e
nt
a
t
i
on: use [verse] for SYNOPSIS se
c
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
artin von Zweigbergk
diff
c
ore
-
r
ename: don't con
s
ider un
m
erged
p
ath as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin vo
n
Z
w
eigber
g
k
rebase:
d
efine options
i
n
OP
T
IONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin
v
on
Z
weigbergk
Makefile: do
n
ot i
n
stall sourced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
merget
o
ol: don't
skip mo
d
ify/
r
emove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von Z
w
e
igbergk
re
r
ere "remainin
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: use @
{
u
pstream} if no upstream specifi
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on Zweigb
e
rgk
rebase -i
:
rem
o
ve unnecessary state rebase-r
o
o
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbe
r
gk
rebase -i: d
o
n't
r
ead unused
v
ariable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
git
-
rebase--am: remove unn
e
cessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbe
r
g
k
rebase -m: don't print exit c
o
de 2 when
merge fai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zw
e
ig
b
ergk
r
ebase -m: r
e
m
ember allow_rer
e
re_aut
o
update
op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: remembe
r
strategy an
d
strategy
o
ptions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: remember
verbose
o
pti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbergk
rebase: extract code for writin
g
basic st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: factor
o
ut sub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbe
r
gk
rebase: make -v a
t
i
ny bit mo
r
e verbos
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
ebase -i: alig
n
variable n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
:
show consistent
c
onflict resolut
i
on hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
ig
b
ergk
reba
s
e: extract am
c
o
d
e to n
e
w so
u
rce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweig
b
erg
k
re
b
a
s
e:
ex
t
ra
c
t merge code to
n
ew source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigbergk
rebase: remove $branch as sy
n
o
nym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Zweigbergk
rebase: factor out
re
f
erence par
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigb
e
rgk
re
b
a
se -i:
s
u
p
p
o
rt --sta
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zwe
i
gber
g
k
reba
s
e
:
r
e
order validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
reb
a
se
:
factor out cal
l
to
p
r
e
-rebas
e
h
ook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zw
e
igberg
k
reba
s
e -
i
: re
m
o
v
e
now un
n
ece
s
sar
y
directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e:
f
actor
o
ut clean work
tre
e
check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: factor out command line option proces
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igb
e
rgk
rebase:
align vari
a
ble content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: stricter
c
h
e
c
k of stand
a
lone sub comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von
Zweigbergk
r
ebase: act on c
o
mmand line outs
i
de parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zw
e
igb
e
r
g
k
reba
s
e: improv
e
dete
c
tion of rebase
in pr
o
gre
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase:
r
emove unused r
e
base stat
e
'prev_
h
ead'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
re
b
ase: read
state outsi
d
e
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: refac
t
or
r
eading of
s
t
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zwei
g
b
e
r
g
k
rebase: clearer names fo
r
direct
o
r
y varia
b
le
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
artin
von Zweigb
e
rgk
co
m
pleti
o
n: add
m
issing co
n
fi
g
uration
va
r
i
a
bles
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zw
e
igbergk
Use reflog i
n
'pull --reba
s
e
.
f
o
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n von Zweigber
g
k
rebase: o
n
ly show stat if co
n
figured to
t
rue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
r
tin von Zw
e
igbe
r
gk
rebase --ab
o
rt: do no
t
update br
a
n
c
h
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigberg
k
r
ebase: s
u
pport --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
a
r
tin von Zweig
b
ergk
Documentat
i
o
n
/git-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
re
b
ase
-
X:
do not
clobber strat
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree