repo.or.cz
/
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: extract function for parsing arguments
2013-01-15
Ma
r
t
in
v
on Zwe
i
gbergk
reset
.
c: extract functio
n
for
pars
i
n
g
argu
m
ents
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
von
Z
w
eigbergk
reset: don't allow "git
r
eset
-
-
$pathspec" i
n
b
are
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Marti
n
von Zweigbergk
r
e
set
.
c: pass pathspec around
i
n
stea
d
o
f (prefix, a
r
gv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
on
Zweigber
g
k
reset
$
pathspec: exit w
i
t
h code
0
i
f
s
u
c
c
essful
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
on Zweigbergk
reset $pathspec
:
n
o
n
e
ed
to dis
c
ard index
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin
v
on Zweigbergk
onewa
y
_me
r
ge(): on
l
y lstat()
whe
n
told to
u
p
d
at
e
worktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
M
artin
v
on Zw
e
igbergk
r
ebase usage: subco
m
ma
n
ds can no
t
be
c
o
m
bined with
-
i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n Zweigbergk
c
h
erry-pick/revert:
respect
o
rder o
f
rev
i
s
ions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zwei
g
bergk
d
e
monstra
t
e b
r
oken 'git cherry
-
pick three one t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
v
on Zweigbergk
teach log --no-walk
=
unsorted, whic
h
a
voi
d
s sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
ar
t
in von Zweigbergk
add tests for 'git rebase --keep-empt
y
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mar
t
i
n von Zwe
i
gbergk
cherry: remove redunda
n
t
c
heck fo
r
m
e
rg
e
commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zwe
i
g
b
ergk
ch
e
rry: don't set ignored
r
ev_i
n
f
o options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von
Z
weigb
e
rgk
remove unnecessary
param
e
ter from get_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
a
rtin
v
on
Z
we
i
gberg
k
add test case for rebase of empty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweig
b
ergk
am
:
don'
t
call m
a
ilinfo if
$re
b
asing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n Zwei
g
be
r
gk
am --reb
a
s
i
n
g: get
patch bo
d
y fr
o
m comm
i
t, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin
von Zweigbergk
rebase --
r
oot: prin
t
usa
g
e
o
n too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin
von Zwe
i
gbe
r
gk
r
e
b
a
s
e:
d
on'
t
s
ource
g
it
-
sh-s
e
tup t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
M
a
rtin von
Zweig
b
e
r
gk
t3
4
01:
u
s
e
test_comm
i
t
i
n setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t
3
4
0
1: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
a
rti
n
v
on Zweigb
e
rgk
am:
d
on't persist
k
eepcr f
l
ag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Zweigbergk
r
e
m
ote:
only upd
a
te remot
e
-
t
rack
i
ng branch if
u
p
dat
i
ng
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
in von
Zweigbe
r
gk
remote rena
m
e
:
warn
w
hen r
e
fspec was n
o
t updat
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
r
e
m
o
te: "rename
o
foo" should no
t
rename ref "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote: w
r
ite correct fet
c
h
s
pec
w
h
en r
e
naming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igb
e
rgk
g
itk: Show
m
odified files
with separate work
t
ree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n
v
on Zwe
i
g
b
ergk
gitk: Simpl
i
fy
cal
c
ulation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n Zweigbergk
gitk:
R
un 'git rev-parse --
g
i
t
-dir'
o
nly on
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
git
k
:
P
u
t
temp
o
rary directory in
s
ide
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
weigbergk
gitk: Fix "E
x
tern
a
l diff"
wit
h
se
p
ar
a
te
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Z
w
eigbergk
gitk: Fix "bla
m
e parent commit" with separate
w
ork
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweigb
e
rgk
gitk: Fix "show o
r
i
gin of this line" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n
von Zweigbergk
gitk: Fix file
hig
h
light when
r
un in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
v
on Zwei
g
be
r
gk
rebase: clari
f
y
"restore
the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Z
w
eigber
g
k
Documenta
t
ion: use [verse] for
S
YNOPSI
S
secti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Z
w
eig
b
ergk
diffcore-rename
:
don
'
t consider u
n
mer
g
ed path as sour
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
a
rtin von
Z
weigber
g
k
rebase: define options in O
P
TIONS
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbergk
Makefil
e
: do
n
ot
i
n
s
ta
l
l sourced re
b
ase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zwe
i
gbergk
merget
o
ol: d
o
n't s
k
ip
m
odify/remove c
o
nfli
c
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
rerere "re
m
aining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
o
n
Zw
e
igbe
r
gk
rebase
:
use @{ups
t
r
ea
m
}
if
no ups
t
r
e
a
m
speci
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase -i
:
remove unnecessary
s
tate r
e
base-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
r
e
b
ase -
i
: don't read unused variable
p
rese
r
ve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
on Zweigbergk
git
-
rebase--am
:
remove unnec
e
ssary
-
-3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von
Zweigbergk
reba
s
e -m: d
o
n't print
e
xi
t
code
2
wh
e
n
m
erge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase -m:
r
emem
b
er allow
_
rerere_autoupdate o
p
tio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigbergk
rebase
:
remember strate
g
y and
strategy
optio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zwe
i
gbergk
r
ebase: reme
m
ber verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase:
e
xtract code for writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
ergk
rebase: factor
o
u
t sub
command handl
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
rebase: m
a
k
e -v a tiny bit m
o
re verbos
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zwei
g
bergk
rebase
-i: a
l
i
g
n var
i
able
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: show
consist
e
nt conf
l
i
c
t r
e
solution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
gbergk
reba
s
e: extra
c
t am code
to
new s
o
urce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zw
e
i
g
bergk
rebase: extract mer
g
e
code
to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
re
b
ase: remove
$
branch a
s
synon
y
m for $ori
g
_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n Zweigbergk
rebase: factor out ref
e
r
e
nce parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
e
base -
i
: supp
o
r
t
--stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
v
o
n Z
w
eigbergk
rebase
:
r
e
order valida
t
ion
s
teps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweig
b
ergk
rebase: fact
o
r out call to pre-reb
a
se hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweigbergk
rebase -i
:
remove
n
ow unneces
s
a
r
y directory chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: factor out
c
l
e
an work tree
c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
gk
rebase: fac
t
or out command line op
t
i
o
n pr
o
cessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
rgk
r
ebase: ali
g
n variable con
t
ent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
ei
g
bergk
r
e
bas
e
: align
variable na
m
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigber
g
k
re
b
a
s
e: s
t
ricte
r
check o
f
s
t
anda
l
one sub com
m
and
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: act on command l
i
ne out
s
ide parsin
g
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
reb
a
se: improve
detectio
n
o
f re
b
as
e
in
progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigber
g
k
reb
a
se:
r
e
move unuse
d
reba
s
e stat
e
'prev_head
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n Zweigbergk
rebase: read state o
u
t
side loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on
Z
weigbergk
rebase: refact
o
r rea
d
i
ng of sta
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zweigbergk
rebase:
c
learer names for dir
e
ctory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigb
e
rgk
completion: add
m
issing c
o
nfigura
t
ion
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rtin von
Z
weigbergk
Us
e
r
e
f
l
o
g
i
n 'pull --re
b
ase
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
r
t
i
n
von Zweigbergk
rebase: only show stat if conf
i
gure
d
to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
arti
n
von Zwei
g
bergk
r
e
bas
e
-
-
abo
r
t:
d
o
not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von Zweigbergk
rebase: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von
Z
weigbergk
Do
c
umenta
t
i
o
n/git-pull: clarif
y
configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebase -X:
d
o
not clobber str
a
tegy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree