repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
reset.c: share call to die_if_unmerged_cache()
2013-01-15
Martin
v
on
Z
weig
b
ergk
res
e
t
.
c: share call to die_if_unm
e
r
ge
d
_cach
e
()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
artin vo
n
Zweigbergk
reset
.
c: extract fu
n
ction for upda
t
ing {ORIG_,
}
HEA
D
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigb
e
rg
k
reset
.
c: remov
e
unne
c
essary var
i
abl
e
'i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
ar
t
in von Zwe
i
gbergk
reset
.
c: extra
c
t function for par
s
ing
a
rg
u
ment
s
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in von
Z
weigbergk
re
s
et: don't all
o
w
"
git res
e
t -- $pathspec" in bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in
v
on Zweigbergk
reset
.
c: pa
s
s pathspec around instead
o
f
(pr
e
fix, argv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweig
b
e
rgk
reset $pathspec: exit
w
ith code 0
if success
f
ul
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
rese
t
$p
a
thsp
e
c:
n
o need to discar
d
i
n
d
ex
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Ma
r
tin
v
on Zweig
b
ergk
o
n
ewa
y
_
m
erg
e
(): only lstat(
)
w
h
en told to update wo
r
ktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Mar
t
i
n
von Zw
e
igbe
r
gk
rebase usage: subcomma
n
ds can not be
combined
w
i
t
h -
i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zw
e
igbe
r
gk
cherry-pick/rever
t
: respect order of revision
s
to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zwei
g
be
r
gk
demonstrate broken 'git
c
herry-pick three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
vo
n
Zweigbergk
teach log --no
-
walk=unsorted, which a
v
oids so
r
ting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
rt
i
n von Zweigb
e
r
gk
a
d
d
tests f
o
r 'git reba
s
e --keep
-
empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin von
Z
weigbergk
cherry: remove redundant check f
o
r
merge com
m
i
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
tin von Zweigbe
r
gk
c
herry
:
do
n
't
s
e
t ignored re
v
_info opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Mart
i
n
v
o
n Z
w
eigbergk
remove unnec
e
s
sary pa
r
ameter from get
_
patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Ma
r
tin
von Zweigbergk
ad
d
test cas
e
for rebase of empty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin
von Zwe
i
gbergk
am: don't call mailinfo if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
tin von Zweigb
e
rgk
am --reb
a
sing: get patch
body fr
o
m commi
t
,
n
o
t from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von Zweig
b
ergk
r
e
b
a
se --roo
t
: p
r
int usag
e
on
t
oo many args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase: do
n
'
t
sou
r
ce git-sh-
s
etu
p
twice
commit
|
commitdiff
|
tree
2011-12-12
Martin v
o
n Zw
e
igbergk
t
3
401: use
test_com
m
it in
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von Z
w
eigbergk
t3401:
modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mart
i
n von Zweigbergk
am: don't pe
r
sis
t
keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
i
n
von Zweigb
e
rgk
remot
e
: onl
y
upd
a
te remote-tracking branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Z
w
eigbergk
re
m
ote rename: warn
w
h
en refspec was not up
d
ated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
i
n
von
Z
wei
g
ber
g
k
r
e
mote: "renam
e
o foo" should
n
ot
r
e
name r
e
f "o
r
igin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
r
t
in
v
o
n
Zweigbergk
r
emote: wri
t
e
c
orrec
t
fetch
spec when ren
a
ming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Show modifi
e
d files with
s
eparate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zwei
g
be
r
g
k
g
it
k
:
Si
m
plify cal
c
ul
a
ti
o
n
o
f
gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk
:
Run 'git rev-parse --git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbe
r
gk
gitk: Put
t
emp
o
rary dir
e
c
to
r
y inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
gitk:
F
ix "External d
i
ff
"
with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zw
e
igber
g
k
gitk: Fix "blame pare
n
t commit" with separate
work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
art
i
n von Zweigberg
k
g
i
tk: Fi
x
"show origin of this line" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigberg
k
gi
t
k: Fi
x
f
ile highlight when run in su
b
d
irector
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von
Zwe
i
g
b
ergk
r
e
base
:
clarify "restor
e
the original
b
ranch
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Mar
t
in vo
n
Zweigbergk
Docume
n
t
a
t
i
on:
u
se [verse] for SYNOPSI
S
sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mar
t
in v
o
n Zweigbergk
diffcor
e
-
rename: don't cons
i
d
er unmerged pat
h
as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von
Zweigb
e
rgk
r
eba
s
e: define optio
n
s in OPT
I
ONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
a
rtin
v
o
n
Z
wei
g
be
r
gk
Mak
e
f
i
le
:
do not in
s
tal
l
s
ourc
e
d
r
e
ba
s
e scr
i
pts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n
v
o
n
Zw
e
igbergk
m
e
rgetool: d
o
n't skip m
o
dify/
r
emov
e
conflict
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweig
b
erg
k
rere
r
e "rem
a
ining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
r
e
base: use @{upstream}
i
f no upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-i: remov
e
unnecessary state reb
a
se-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigber
g
k
rebase -i: d
o
n't
read
un
u
sed var
i
able prese
r
ve_me
r
g
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on
Z
weigbe
r
gk
gi
t
-rebase--am: re
m
ove unnecessary
-
-3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigberg
k
r
e
base -m: don't
pr
i
nt exit co
d
e 2 when merge fai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebas
e
-m: remem
b
er
allow_rerere_aut
o
upd
a
te opt
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
rebase: remember st
r
ategy
and s
t
rategy opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in vo
n
Zweig
b
ergk
reb
a
se
:
remember
verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
be
r
gk
rebase: extract code for writing bas
i
c s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
:
f
actor out sub command
h
andlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbe
r
gk
rebase: make -v a tiny bit more
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Z
w
e
i
gbergk
rebase -
i
: ali
g
n varia
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eig
b
er
g
k
rebase: s
h
ow consistent conflict r
e
solution hin
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
rebase
:
extract am code to new
s
o
urc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zweigbergk
rebase: extract me
r
ge code
to new
sour
c
e file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
reba
s
e: r
e
m
o
ve $branch as s
y
nonym for $orig_h
e
ad
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: factor out reference
p
ar
s
in
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase -i: suppor
t
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: reorder valida
t
ion steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
fa
c
tor o
u
t cal
l
to pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
weigbergk
rebase -i: rem
o
ve now
unneces
s
ary direct
o
ry checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n Zweigberg
k
rebase: factor
out cle
a
n work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
bergk
r
ebase: fa
c
to
r
out comm
a
nd line
option proce
s
sin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigber
g
k
rebase: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
ergk
re
b
a
se: align v
a
r
i
able names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase:
stricter check of standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
gk
rebase
:
act on comman
d
l
i
ne ou
t
side parsin
g
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: imp
r
ove de
t
ection of rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
gbergk
reb
a
se: remove
u
nused
r
eb
a
se st
a
te 'prev_
h
ead'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbergk
reb
a
se: read state outside
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigb
e
rgk
rebase: refactor re
a
ding of st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
bas
e
:
c
learer names for
d
irecto
r
y v
a
ri
a
bl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
a
rtin vo
n
Zwei
g
b
e
rgk
complet
i
on: add mi
s
sing configuration 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
Mar
t
in von Zweigbergk
r
e
base: only show s
t
at if
c
o
nfigured to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zw
e
igbergk
rebas
e
--abort:
do not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin
von
Z
w
e
igbergk
re
b
ase: support --
v
eri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin
von Zwei
g
bergk
Docume
n
tation/git-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin v
o
n Zw
e
igb
e
rgk
rebase -X: do
n
ot clobber st
r
a
t
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree