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: move lock, write and commit out of update_index_refresh()
2013-01-15
Mar
t
in von Zweigbergk
r
e
set
.
c: move lock
,
w
r
ite and commit out of upda
t
e_in
d
e
x_ref
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rt
i
n vo
n
Z
w
eig
b
ergk
reset
.
c: move update_ind
e
x
_
ref
r
esh() call out o
f
re
a
d_from_t
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Z
w
eigb
e
r
gk
reset
.
c: replace sw
i
tch by i
f
-else
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zw
e
igbergk
reset:
avoi
d
r
e
d
undant e
r
ror messa
g
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Zwe
i
gbergk
reset --keep: only write
i
ndex file once
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigb
e
r
g
k
res
e
t
.
c: share call to die_if
_
unmerged_cache()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Zwe
i
g
bergk
re
s
et
.
c: ex
t
ract function for updating
{
ORIG_,}HEAD
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
r
tin vo
n
Zwei
g
bergk
reset
.
c: remov
e
unnecessa
r
y va
r
iabl
e
'i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Marti
n
von Zweigbergk
reset
.
c
:
extract functi
o
n
for parsi
n
g arguments
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zw
e
igbergk
res
e
t: don'
t
allow "git r
e
se
t
-- $pat
h
spec" i
n
bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin v
o
n
Z
weigber
g
k
r
e
set
.
c
: pass p
a
thspec aro
u
nd instead of
(
pre
f
ix, argv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Z
wei
g
bergk
r
eset $pathspec: exit
w
ith
code 0 if successful
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
tin von Z
w
e
i
gbergk
r
eset
$
p
a
thspe
c
: no
need to dis
c
ard
inde
x
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin
v
on Zweig
b
ergk
o
ne
w
ay_merge(): on
l
y
ls
t
at() when told to update work
t
r
e
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von Zweigbergk
rebase usage: sub
c
o
m
mands can no
t
be combined with -
i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von
Z
weigbergk
cherr
y
-
pick/revert: respe
c
t
order of
r
evisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n v
o
n
Z
we
i
gbe
r
gk
d
e
monstrate
bro
k
e
n
'g
i
t cherry-pic
k
t
hree one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Marti
n
von Zweigbergk
teach
l
o
g --no-
w
alk=
u
n
sorte
d
, which a
v
oids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
rtin von Zw
e
igb
e
rgk
add
test
s
for
'
g
i
t reb
a
s
e
--
k
eep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Marti
n
von Zweigbergk
cher
r
y: remove redun
d
a
nt
check
f
or merge co
m
mit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zw
e
igbergk
ch
e
rry: don't set ignore
d
re
v
_info
o
p
t
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Mar
t
in von
Z
weigber
g
k
remove unneces
s
ary parameter
from get_patc
h
_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin vo
n
Zwe
i
gbergk
ad
d
te
s
t
case for reb
a
se of
em
p
ty com
m
it
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zw
e
i
gbe
r
gk
a
m: do
n
'
t
call
m
ailinfo
i
f $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zwe
i
gbergk
am --rebasing: get
p
at
c
h
body from commit
,
not f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase --ro
o
t: print usage on too many args
commit
|
commitdiff
|
tree
2012-06-26
M
artin von Zweigbe
r
gk
rebase:
d
on't source
g
i
t-sh-s
e
tup twice
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von Zwe
i
gbergk
t3401: use tes
t
_
c
ommit in
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin v
o
n Zweigbergk
t
3
401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mar
t
in von Zweigbergk
am: don
'
t persist
keepc
r
f
l
ag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigberg
k
remote: only
update remote-tracking branch
i
f up
d
ating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zweigbergk
remote rename:
warn
w
hen
refspe
c
w
a
s not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote: "rename o foo" sh
o
uld not
rename ref
"
origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
r
t
i
n
von Zweigbe
r
gk
remote: writ
e
correct fetch
spec when renaming remo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin v
o
n Zwe
i
gberg
k
g
itk:
S
h
o
w
m
od
i
f
i
ed files wi
t
h
s
eparate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
i
gbe
r
gk
gitk
:
Si
m
p
l
i
fy c
a
lculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
in
v
o
n Zwei
g
berg
k
gitk: Run 'gi
t
r
e
v-parse -
-
git-dir
'
on
l
y once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigb
e
rgk
gi
t
k: Put te
m
porary d
i
rectory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbergk
gitk: Fix
"Ext
e
rnal diff"
w
ith
s
eparate work t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zwei
g
b
e
rgk
gitk: Fix "blame parent c
o
mmit
"
w
i
th separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zw
e
i
gbergk
gitk
:
Fix "
s
how ori
g
in of this line" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin vo
n
Zweigbergk
gitk: Fix
file highlight wh
e
n run in
subdire
c
t
or
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
rebase:
clarif
y
"restore the original b
r
anch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweigbergk
Documentat
i
on:
u
se [
v
e
rse] fo
r
SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zw
e
i
g
bergk
dif
f
core-renam
e
:
don't consider unmerged path
a
s
source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
von Z
w
eigbergk
rebase:
d
efine options in OPT
I
ONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
a
rtin von Zweigbe
r
gk
Ma
k
efile
:
do not install sourced reb
a
se scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
t
in von Zweigb
e
rgk
me
r
geto
o
l: don't skip modify
/
r
emove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n von Zweig
b
ergk
r
ere
r
e
"r
e
maining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Z
weigbergk
rebase:
u
se @{upstream} if n
o
upstream sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbergk
rebase -i: remove unnece
s
sary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -i: don't read unused variable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
r
gk
git-rebase
-
-am: remov
e
un
n
eces
s
ary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase -m: don't prin
t
ex
i
t c
o
de 2
w
hen merge
f
a
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase -m
:
r
emember allow_rerere_
a
utou
p
d
a
te option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
: re
m
ember s
t
rategy and strat
e
gy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigberg
k
rebase:
r
emember verbos
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract code for writing basi
c
sta
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigber
g
k
rebase: factor
o
ut sub co
m
mand
handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
o
n
Zweigbergk
r
ebase:
m
ake
-v a tiny bit
more verb
o
se
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
reba
s
e -
i
: align variable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbe
r
gk
r
e
b
ase: s
h
ow cons
i
stent conflict resolu
t
i
o
n hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e:
extra
c
t
am code to new
so
u
r
c
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
gk
re
b
ase
:
extract merge code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Zwe
i
gbergk
re
b
ase: remove $branch as sy
n
onym f
o
r $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigbergk
rebase: factor
out reference
p
ar
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
r
ebase -i: sup
p
o
r
t
--sta
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: reorder validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigber
g
k
r
e
base: factor out
c
all to
pr
e
-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase
-
i: remove no
w
unn
e
cessary
directory check
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase
:
factor out clean wo
r
k
t
r
ee check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zwe
i
gbergk
reba
s
e: factor out com
m
and line option p
r
ocessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
reba
s
e: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rgk
re
b
a
s
e:
a
l
ig
n
variable name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n
von Zweigbergk
r
ebase:
s
tricter check of s
t
and
a
l
one sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigbergk
rebase
:
a
ct o
n
command line outside parsing
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zweigbergk
reba
s
e: improve detection of rebase
in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
re
b
ase: remove unused rebase
state
'prev_h
e
ad'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Z
we
i
gbergk
rebase: read state outsi
d
e loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigb
e
rgk
rebase: refactor
reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: clear
e
r names for directory
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mart
i
n von Zweigbergk
completion: add missing configu
r
ation v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Zweigberg
k
Use
r
eflo
g
in 'pull --
r
e
b
a
se
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in von Zweigber
g
k
r
e
ba
s
e: only show stat if
co
n
f
igured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Mart
i
n von Zweigbe
r
gk
r
e
base --abort: do not upda
t
e b
r
anc
h
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
rebas
e
: supp
o
r
t
--ve
r
ify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
tin
von
Z
weigbergk
Docum
e
ntation/git-p
u
l
l:
c
larify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebase -X: do not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree