repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
reset: avoid redundant error message
2013-01-15
Martin von Zweigbergk
reset: avoid redundant error message
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Zweigbergk
reset --keep: only write ind
e
x file once
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Marti
n
von Zwei
g
ber
g
k
re
s
et
.
c: share call to die_if_unme
r
ged_
c
ache()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zwe
i
g
bergk
reset
.
c: extract function for up
d
ating {ORIG_,}HEAD
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Zweigbergk
reset
.
c
: remove u
n
necessary variabl
e
'i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
re
s
et
.
c: extra
c
t fu
n
c
ti
o
n for parsing
a
rguments
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
o
n
Z
wei
g
be
r
g
k
reset:
d
o
n't allow "gi
t
reset --
$pathspec" i
n
bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
r
tin von Zweigber
g
k
reset
.
c: pass pathspec around in
s
tead of
(prefix, argv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
r
eset $pat
h
s
pe
c
: exit wit
h
cod
e
0 if successfu
l
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von
Zweigbergk
reset $pathspe
c
: n
o
n
e
e
d to discard index
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin
v
on Zweigbergk
oneway_merge(): only l
s
t
a
t() when told to upda
t
e worktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
M
a
r
t
in von Zwei
g
bergk
re
b
ase us
a
ge: su
b
commands can not be comb
i
ned with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zw
e
i
g
bergk
c
h
erry-pi
c
k/revert: respect ord
e
r of re
v
isions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin vo
n
Zweigbergk
demo
n
s
trate brok
e
n 'g
i
t cherry-
p
ick
thre
e
o
ne two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n
von Zwe
i
gb
e
rgk
teach log --no
-
walk=unsorted, which avoids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zwe
i
gbergk
add t
e
sts for 'git re
b
ase --keep-emp
t
y
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
a
rtin von Zw
e
ig
b
ergk
c
herry: remove redundant
c
h
e
c
k
f
o
r
merge com
m
it
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin vo
n
Zwei
g
bergk
che
r
ry: don't
s
e
t ignored rev_inf
o
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Ma
r
tin
v
on Z
w
eigbergk
remove unnec
e
s
s
ary parameter from get_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von
Z
weigb
e
rgk
add t
e
s
t
c
a
s
e
for
rebase of empty
c
o
mmit
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zwe
i
gber
g
k
am:
don't call mailinfo
i
f $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n
von Zweigbergk
am -
-
rebasi
n
g: ge
t
p
a
tch body from commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Zwe
i
gbergk
rebase --root: print usage on to
o
many a
r
gs
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von Zweigber
g
k
r
e
base: don'
t
so
u
rce git-sh-s
e
tup
t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Marti
n
von
Z
weigbe
r
gk
t34
0
1: use test_com
m
it in s
e
tup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
on Zwe
i
gbergk
t
3
401: moderni
z
e 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
persist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zwe
i
gbergk
remote: only
u
p
d
ate
remo
t
e-tracking branch if updati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von
Z
weigbergk
remote rename: warn when refspec was n
o
t updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Z
w
eigber
g
k
remote: "re
n
am
e
o
f
oo" shou
l
d
not rename r
e
f "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remo
t
e: writ
e
cor
r
ect fet
c
h spec
when renaming
r
emote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zw
e
igbergk
gitk: S
h
ow modified files with
separate w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweigbergk
gitk: Simplify
c
alculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
gitk: Run
'git
rev-pa
r
se --git-dir' only
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Zweigbergk
gitk: Put
temp
o
rary
directory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Fi
x
"Exter
n
al d
i
ff"
w
ith separ
a
te wo
r
k
t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigbergk
g
itk: Fix "blame
p
arent commit" with separa
t
e work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zw
e
ig
b
ergk
g
i
tk: Fix "show origin of this line" wi
t
h separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
itk: Fi
x
file highlight when ru
n
in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
von Zweigb
e
rgk
reb
a
se: cl
a
rif
y
"re
s
to
r
e th
e
orig
i
nal branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
a
rtin von Zweigbergk
Document
a
tion:
u
se [vers
e
] fo
r
SYNOPSIS section
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
artin von Zw
e
igberg
k
dif
f
core-
r
ename: don't consider unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
tin von
Zwe
i
gbe
r
gk
rebase: de
f
in
e
options in OPTIONS
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweig
b
e
r
g
k
Mak
e
fi
l
e: do n
o
t i
n
stall so
u
rced
r
eba
s
e scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
in von Zweig
b
ergk
mergetool: don
'
t
s
kip modif
y
/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin v
o
n Zweigbergk
r
e
rere
"re
m
a
ini
n
g"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
be
r
gk
r
eb
a
s
e
: use @{upstream} if no upstr
e
am speci
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
i
gbergk
rebase -i:
remove unnecessary s
t
a
t
e rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
base -i:
d
o
n't r
e
a
d
unused v
a
riable preserve_m
e
rge
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zw
e
igbergk
git-reb
a
s
e
--am:
r
emo
v
e
u
nnecessary
--3way optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebas
e
-m: don't print
e
xit code
2
when m
e
rge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
r
ebase -m: remember allow_rerere
_
a
utoupda
t
e
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
v
on Zweigbergk
reb
a
se: r
e
membe
r
strate
g
y a
n
d
s
t
ra
t
egy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
a
s
e: r
e
member
v
erbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Z
w
ei
g
bergk
rebase:
extr
a
ct co
d
e for writi
n
g basic s
t
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase:
factor o
u
t sub c
o
mmand handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwei
g
berg
k
r
e
base
:
ma
k
e
-
v
a
tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zweigb
e
rgk
rebase -i: al
i
gn variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbergk
reb
a
se: sh
o
w consistent con
f
lict resoluti
o
n hin
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigberg
k
r
ebase: extract a
m
c
ode to new sour
c
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
vo
n
Zweigbergk
rebase: extract merge code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
w
eigber
g
k
reb
a
se: remove $branch as synonym for $orig_
h
ead
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase: factor
out r
e
feren
c
e par
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase -i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
reo
r
der validation ste
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
f
a
c
tor out call to
p
re
-
r
e
b
a
se h
o
ok
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase
-
i: remove now u
n
nec
e
ssary director
y
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
reba
s
e: factor out c
l
e
a
n wor
k
tree
c
h
e
ck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zwe
i
g
b
ergk
rebase: factor o
u
t c
o
mmand li
n
e
o
ption processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigb
e
rg
k
rebase:
align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigbergk
r
e
base: a
l
ign variable n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase:
s
tricter c
h
e
c
k
o
f
s
tandalone sub comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
rebase: ac
t
on comma
n
d line outs
i
d
e parsi
n
g loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
reb
a
se
:
i
m
prove
detectio
n
o
f
re
b
ase
i
n progr
e
ss
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gb
e
rgk
reb
a
se: re
m
ove unus
e
d
r
eb
a
se sta
t
e '
p
rev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zweigbergk
r
ebase: read sta
t
e outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
re
b
a
se: refactor reading of
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zw
e
igbergk
rebas
e
: clearer
names for directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbergk
completio
n
:
add missing configuration variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zwe
i
gbergk
Use ref
l
og
in
'pull --reba
s
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
von
Z
weigbergk
r
ebase: only
s
h
o
w
s
tat if
c
onfigured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbergk
rebase --abort: do
n
ot
update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zwe
i
gberg
k
r
ebase
:
sup
p
ort --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
a
r
tin von Zweigbe
r
gk
Docu
m
entati
o
n/gi
t
-p
u
ll: cla
r
ify conf
i
guration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Mart
i
n
von
Z
weigb
e
rgk
re
b
ase -X
:
do n
o
t clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree