repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
reset.c: finish entire cmd_reset() whether or not pathspec is given
2013-01-15
Martin von
Z
weigb
e
r
g
k
r
e
set
.
c: fi
n
ish entire cmd_reset() whether o
r
not
p
athspec
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mart
i
n von Zweigbergk
reset [--mixed]: only
write
i
n
d
ex
file once
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
reset
.
c:
m
ove
l
ock
,
w
r
ite and c
o
mmi
t
out
of update_index_ref
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zw
e
igb
e
r
g
k
reset
.
c:
mo
v
e u
p
date_in
d
ex_refr
e
sh() call o
u
t of
read_fro
m
_t
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
t
i
n
von Zweigb
e
rgk
reset
.
c: replace switch by if-els
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin vo
n
Zweigber
g
k
r
eset: a
v
oid redun
d
ant error message
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zwe
i
gbe
r
g
k
reset -
-
kee
p
: on
l
y w
r
ite
i
ndex file onc
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zwe
i
gbergk
reset
.
c:
s
hare
call to die_if_unmerged_cache()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
ti
n
von
Zweigbergk
r
e
set
.
c
:
e
xtr
a
ct function for up
d
ati
n
g {O
R
I
G
_,}HEAD
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigb
e
rg
k
reset
.
c: remove unneces
s
ary variable
'
i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zw
e
igbergk
re
s
et
.
c:
e
xtract function for parsing argume
n
ts
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von
Zwe
i
gbergk
reset: don't allow "git reset -- $pathspec" in bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zweigbe
r
gk
reset
.
c
:
pass p
a
thspe
c
around in
s
tead of
(
p
r
e
fix, a
r
gv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
on Zweigbergk
r
e
s
e
t $
p
a
thspec: exi
t
with
c
ode 0 if successfu
l
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
on
Zweigbergk
reset $pat
h
spec: no need
to di
s
c
a
r
d index
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
Martin von Zweigber
g
k
oneway_merge(): only lstat() wh
e
n
t
old to
u
pdate
w
orktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von Zweigbe
r
gk
rebase usage
:
s
ubcommands can not be co
m
bined w
i
t
h -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rti
n
v
on
Zweigbergk
cherry-pic
k
/reve
r
t: respe
c
t
order of revisi
o
ns to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigber
g
k
de
m
onstrate broken 'gi
t
cherry-pick three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
artin
v
o
n
Zwei
g
bergk
t
each log --no-walk=unsorte
d
, which avoi
d
s sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zweigbergk
add
tests for
'git rebase --kee
p
-empt
y
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
von
Z
weigbe
r
gk
che
r
ry:
r
emove redundant
check for
me
r
g
e
commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
v
on Zweigbergk
cherry: don't
s
e
t
ignored rev_info
o
ptions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zweigber
g
k
r
emove
u
n
n
ece
s
sary
p
arameter from get_pat
c
h_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mart
i
n vo
n
Zweigbergk
ad
d
test
c
ase for rebase of empty
commit
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n Zweigbergk
a
m
: don't call
mailinfo if $
r
ebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
artin von
Z
w
ei
g
be
r
gk
am --rebasing
:
get patch
bo
d
y fro
m
commit,
n
ot f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zw
e
ig
b
ergk
rebas
e
--root: print us
a
ge o
n
too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n
Z
wei
g
berg
k
r
e
base: don't sour
c
e git-sh-setu
p
t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin v
o
n Zwe
i
gbergk
t340
1
: use
t
e
s
t_c
o
mmit in setu
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Ma
r
tin von Zwei
g
b
erg
k
t3401: moderni
z
e style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mar
t
in von Zweigbergk
a
m
: don
'
t persist keep
c
r flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
ti
n
von Zweigbergk
remote: only updat
e
re
m
ot
e
-tracking br
a
nch if up
d
ating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigber
g
k
rem
o
te rename:
warn when refspec was not
u
pdated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n von
Z
w
eigbergk
remote: "rename
o
fo
o
" sh
o
uld
n
ot rename ref "
o
rigin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Zweig
b
ergk
r
e
mote: write c
o
r
rec
t
f
et
c
h spec when
r
enaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
art
i
n von
Z
weigb
e
r
gk
gitk: Show m
o
dified files with se
p
a
rate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zweigbergk
gi
t
k: Simplify
ca
l
culation
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rt
i
n von Zw
e
igbergk
git
k
: Run 'git rev-parse --gi
t
-di
r
' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
ar
t
in von
Z
weigbergk
gitk: Put temporary
directory
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
gi
t
k
: Fix
"
E
x
t
ernal diff" wi
t
h separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
gitk
:
Fix "blam
e
p
a
re
n
t comm
i
t
"
w
ith separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zweigbergk
g
i
tk: Fix
"
show origin of this
l
ine"
with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbergk
gitk
:
Fix fi
l
e hi
g
hlight when
r
u
n
in subdirec
t
ory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
rebase
:
cl
a
rify "rest
o
re the original b
r
anch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweig
b
ergk
D
ocument
a
tion: use [verse] for
S
YNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigberg
k
diffcore-rena
m
e: don't
consider un
m
erged
path as s
o
urce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
tin von Zweigbergk
rebase: def
i
n
e options in OPT
I
ON
S
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Mar
t
in von
Z
w
eigbergk
Makefile: do not in
s
tall s
o
urced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zweigbergk
merget
o
ol: don't skip modify/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 "remai
n
ing"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zweigbergk
r
ebase: use @{upstream} if
n
o ups
t
ream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
re
b
ase -i: rem
o
ve unnecessary state r
e
b
ase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigber
g
k
r
e
base -i:
don't read unuse
d
v
ariab
l
e preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
git-
r
eba
s
e-
-
am: remove unneces
s
ary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
reba
s
e
-m:
d
on't print exit code 2 w
h
e
n
merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reb
a
se -m: remember allo
w
_rerer
e
_autoup
d
a
te o
p
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
r
e
base:
r
emember strategy
and st
r
ategy
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase
:
rem
e
mber
v
er
b
ose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweig
b
erg
k
rebase: extract co
d
e for wri
t
ing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbe
r
gk
rebase: factor out sub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gb
e
rgk
rebase: make -v a tiny bit m
o
re verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase
-
i: a
l
ign var
i
able names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igberg
k
rebase: show consistent confl
i
ct re
s
olution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
we
i
gbergk
rebase
:
e
xtract am code to
n
e
w
source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n
Zw
e
igbergk
rebase:
extract merg
e
code to new source fil
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Zweigb
e
rgk
rebase
:
re
m
o
v
e $bran
c
h as synonym fo
r
$orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: fact
o
r out
r
e
f
e
r
en
c
e p
a
rsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-i: su
p
p
o
rt
--
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
r
ebase: r
e
order
v
alid
a
tion s
t
eps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigbergk
re
b
as
e
: fac
t
or
o
ut call to pr
e
-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
g
k
r
ebase -i: r
e
move now unnecessary di
r
e
c
tory ch
e
c
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: factor
out clean
work tr
e
e che
c
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigb
e
rgk
reba
s
e: facto
r
o
u
t
com
m
and line option
p
roc
e
ss
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: alig
n
variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweig
b
ergk
rebase: ali
g
n var
i
a
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von
Zweigbergk
rebas
e
: stricter
ch
e
ck o
f
standa
l
one sub
c
ommand
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigberg
k
reb
a
s
e: a
c
t on com
m
and lin
e
out
s
ide parsing lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
bergk
rebase: improve detection of re
b
ase
i
n progr
e
ss
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
e
igbergk
r
e
base: r
e
move
u
n
u
s
e
d reba
s
e state 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigbergk
rebase: read
s
tate o
u
tside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
r
e
base: refa
c
to
r
reading of
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigbergk
r
ebase: clear
e
r names for di
r
ec
t
ory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
in von Zw
e
igbergk
co
m
ple
t
ion
:
add
mi
s
si
n
g co
n
figur
a
t
i
on variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Zweigbergk
Use reflog in
'pull --r
e
ba
s
e
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
artin vo
n
Zw
e
igbergk
rebas
e
: on
l
y s
h
ow stat
i
f configure
d
to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin
v
on Zweigbergk
reba
s
e --abort: do no
t
u
p
d
ate br
a
nch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zw
e
igb
e
rgk
r
e
b
ase:
s
upport
--ver
i
fy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zwei
g
bergk
Document
a
t
ion/git-pull:
cl
a
r
i
f
y confi
g
uration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zwe
i
gber
g
k
rebas
e
-X: do not
clobber stra
t
e
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree