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: inline update_index_refresh()
2013-01-15
M
artin von Zweigbergk
reset
.
c:
inline update_index_ref
r
esh()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
artin von Zweigbergk
reset
.
c: fini
s
h
entir
e
cmd_r
e
se
t
()
whethe
r
or not pathspec
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
von Zweigbergk
r
eset [
-
-mixed]: only
w
r
it
e
in
d
ex file once
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin
v
on Zwe
i
gbergk
reset
.
c: move lock
,
write and commit out of update_index
_
ref
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
tin
von Zweigber
g
k
r
e
set
.
c:
m
ov
e
updat
e
_inde
x
_r
e
fr
e
sh() call
o
ut of
re
a
d_from
_
t
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
re
s
et
.
c:
replac
e
s
witch by
i
f-else
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
o
n Zweigbergk
reset: avo
i
d redu
n
d
ant erro
r
messa
g
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zweigber
g
k
reset --ke
e
p
: only write inde
x
f
i
le o
n
ce
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin v
o
n Z
w
eig
b
e
rgk
reset
.
c: share ca
l
l to di
e
_if_unm
e
rged_cache()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
i
n
von Zweigbergk
reset
.
c: extr
a
c
t fun
c
t
i
on for updating
{OR
I
G_,}HEAD
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset
.
c
: remove unnecess
a
ry variable 'i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
res
e
t
.
c
:
e
xtract f
u
nctio
n
for parsing arguments
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
artin von Zweigbergk
reset:
d
on
'
t all
o
w
"git reset
-
- $pathspec" in bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Z
w
e
i
gb
e
rgk
res
e
t
.
c: pa
s
s pathspec
aro
u
nd in
s
tead of
(pref
i
x
,
argv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
von
Z
weigbergk
re
s
et $pathspec: exi
t
wi
t
h code 0 if successfu
l
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
r
e
set
$
pathspec
:
no need to
d
iscard in
d
ex
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin v
o
n
Z
w
e
i
gbergk
o
n
e
w
ay_merge(): o
n
ly lstat()
w
h
e
n told to
upda
t
e work
t
ree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von
Zwei
g
b
e
rgk
re
b
ase usage: subc
o
mmands can not be combine
d
with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
art
i
n von Zwei
g
ber
g
k
cherry-pick/revert: r
e
spect order of revisi
o
ns to
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
artin von Zweigbergk
d
emonstrate b
r
o
k
en 'git
cherry-pi
c
k
three
one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n von
Z
weigber
g
k
te
a
ch lo
g
--no
-
walk=unsorted, which avoid
s
s
orting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
ar
t
in von Zweigbergk
add te
s
ts for 'git r
e
base --keep-emp
t
y'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
art
i
n von Zweigbergk
cherry:
r
emove redund
a
nt chec
k
f
o
r mer
g
e commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
r
tin von Zweigbe
r
gk
cherry: do
n
't set ignored r
e
v_info
o
pt
i
o
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Mart
i
n von
Zwe
i
gberg
k
remove unnecessary parameter from ge
t
_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
ar
t
in von Zweigbergk
a
d
d test case
f
o
r rebase of empty commi
t
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigb
e
rgk
am: don't cal
l
m
ailinf
o
if
$
reba
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am --rebasing:
get patch body from commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweig
b
ergk
rebase
--
r
oot: print usage on too man
y
args
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
tin von Zweigbe
r
gk
re
b
as
e
: don
'
t source
g
it-sh-
s
etup twic
e
commit
|
commitdiff
|
tree
2011-12-12
M
artin
v
on Zwe
i
gbergk
t34
0
1: use test_commit in
setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweig
b
ergk
t3401:
modernize styl
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin
von Zwe
i
gbergk
am: don't
p
ersist keep
c
r flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in v
o
n Zweigbergk
remote: only update remote-tr
a
ck
i
ng
branch i
f
u
pdating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote re
n
a
me
:
warn whe
n
r
efspec
w
as
n
o
t
u
p
date
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
i
n
von Zwe
i
gbe
r
g
k
remot
e
: "rename
o
f
o
o" sho
u
ld n
o
t
renam
e
r
e
f
"origi
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
o
n Z
w
eigbe
r
gk
re
m
ote:
w
rite correct
fetc
h
spec when renaming remo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin
v
on Zweigbergk
gitk: Show m
o
dified files with separate
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigberg
k
gitk: S
i
mplify
c
alculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
wei
g
bergk
gitk
:
Run 'git r
e
v-parse --git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweig
b
ergk
gitk: Put temporary direct
o
ry inside
.
g
it
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rt
i
n von Zweigberg
k
gitk: Fix "Exte
r
nal
diff"
w
ith
separa
t
e wor
k
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweigbergk
gi
t
k: Fi
x
"bl
a
me p
a
r
e
nt comm
i
t" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zwei
g
bergk
gitk: Fix "
s
how origin of
this
l
i
ne" with sep
a
rat
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweigbergk
gitk: Fix file h
i
ghlight
w
h
en run i
n
s
u
bd
i
rectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Ma
r
tin vo
n
Zwei
g
bergk
reba
s
e:
c
lari
f
y "re
s
tor
e
t
he origin
a
l branc
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von
Z
weigbergk
Docum
e
ntation: use [ver
s
e] fo
r
SYN
O
P
SIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Ma
r
tin v
o
n Zweigbergk
diffcore-ren
a
m
e
: don't consider
unmerged
path as so
u
rce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
von Zweigbergk
reb
a
se: define options in OPTIO
N
S_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zwei
g
bergk
Makefile: do not i
n
stall sourced r
e
ba
s
e scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
mer
g
et
o
ol: don't ski
p
mod
i
fy/remove confli
c
ts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rtin von Zweigbe
r
gk
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
re
b
a
s
e: use
@
{ups
t
ream}
if
no upst
r
eam sp
e
cif
i
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n
Z
we
i
gbergk
rebase
-i: remove un
n
eces
s
ary
s
tate re
b
ase-roo
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase -
i
: don
'
t rea
d
unu
s
ed v
a
riable prese
r
ve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n v
o
n Z
w
eigbergk
git
-
re
b
ase--am:
remo
v
e unnecess
a
ry
-
-3way op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
reb
a
se -m: don't
p
r
int
e
xit code 2 when merge fa
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigb
e
r
gk
rebase
-
m: rem
e
m
b
er
a
l
l
o
w_rerere_autoupdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: remember st
r
a
teg
y
and strateg
y
o
p
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase: r
e
m
e
mber verbose opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigber
g
k
rebase: extract code for w
r
i
t
ing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
f
a
c
tor out
s
ub
c
omma
n
d handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwe
i
gbergk
reb
a
se: m
a
k
e
-v a tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase -i
:
alig
n
v
a
riabl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n
v
o
n Zweigbe
r
gk
rebase: s
h
ow
consistent co
n
flict r
e
solution hi
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
r
eba
s
e
:
extr
a
ct am code to new
source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zwe
i
gbergk
rebas
e
: extr
a
ct merge co
d
e to new sour
c
e file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
r
e
move $branch as synonym
f
or $orig
_
head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
g
k
r
eb
a
se: factor
out ref
e
rence
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
erg
k
rebase -i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwei
g
bergk
reba
s
e: reord
e
r va
l
ida
t
ion
s
te
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweig
b
ergk
reb
a
se: fa
c
t
o
r out call to pre-
r
ebase hoo
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
r
e
base -i: remov
e
now unne
c
essary directory
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweig
b
ergk
r
ebase: factor out clean
w
o
rk tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbergk
rebase: factor out
c
o
mmand line o
p
tion processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
r
e
b
as
e
: align varia
b
le content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbe
r
gk
reba
s
e: align variable name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
we
i
gbergk
rebase
:
stri
c
ter che
c
k
of
standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n
Z
wei
g
ber
g
k
r
e
base: act on co
m
mand lin
e
o
u
t
s
ide
parsi
n
g
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbergk
reba
s
e:
improve
d
et
e
c
t
io
n
of rebase in pr
o
gress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
reb
a
s
e
: r
e
move
unuse
d
rebase
s
tate 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
rebas
e
: read
s
tate outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
gk
rebase: refa
c
tor r
e
ading of s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zwei
g
bergk
r
e
base: clearer nam
e
s f
o
r directory va
r
iables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
a
rtin von Zweigbergk
completion: add mi
s
sin
g
config
u
r
atio
n
vari
a
b
l
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweig
b
ergk
Use re
f
log in 'pull --
r
e
b
ase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n von Zweigbergk
rebase: only show stat if config
u
red to t
r
ue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Mart
i
n
von
Z
w
ei
g
be
r
gk
reb
a
se --abort: d
o
not update branc
h
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
a
rtin von Z
w
ei
g
be
r
gk
rebase: sup
p
ort --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zw
e
i
gbergk
Documen
t
atio
n
/git-pull
:
clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin v
o
n Z
w
eigbergk
re
b
a
s
e -X: d
o
n
ot clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree