repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
reset [--mixed]: only write index file once
2013-01-15
Martin von Zwe
i
g
b
ergk
reset [--mixed]: only write in
d
ex file
o
nce
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin
v
on
Zweigbergk
reset
.
c: move lock, w
r
ite and
commit out of
u
pd
a
te_inde
x
_ref
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
re
s
e
t
.
c: move updat
e
_index_refresh() call out of read_from_t
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Z
w
eigb
e
r
gk
reset
.
c: replace switch by if-
e
lse
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweig
b
ergk
reset
:
avoid redundant error message
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zweigberg
k
reset --keep:
o
nly wr
i
t
e i
n
d
e
x
f
i
le on
c
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
a
rtin von Zw
e
igberg
k
reset
.
c: share call
t
o die_if_unmerged_cache()
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zweigbergk
re
s
et
.
c: extrac
t
f
u
nction
f
o
r
u
p
dating {ORIG_,}HEAD
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in von
Z
weigb
e
rgk
reset
.
c: r
e
move unneces
s
ary variab
l
e 'i'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Martin von Zw
e
igbergk
reset
.
c
:
e
x
tract function for parsi
n
g
arguments
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
M
artin von
Z
weigbe
r
g
k
r
e
set:
d
o
n
't all
o
w "git rese
t
-- $p
a
th
s
pec"
i
n bare
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Mar
t
in vo
n
Z
w
e
i
gbe
r
gk
reset
.
c: pass pa
t
hspec ar
o
und inst
e
ad of (pref
i
x
,
argv
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
tin
v
on Zweigbergk
reset $pathspec: exit w
i
th code 0
i
f
suc
c
ess
f
ul
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2013-01-15
Ma
r
tin
von Zweigbergk
reset
$path
s
pec: no need to discard index
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-20
M
a
rtin
von Zweigbergk
onewa
y
_merge(): only lstat() when t
o
ld to u
p
date
w
orktr
e
e
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin
vo
n
Zwei
g
be
r
gk
rebase usage: subcommands can not be
c
ombined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Marti
n
v
on Zwe
i
gb
e
rgk
c
h
erry-pick/revert: respect
o
rder
o
f revisions to
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von
Z
weigbergk
d
e
mo
n
strate bro
k
en 'git ch
e
rry-pick th
r
ee one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigb
e
rgk
tea
c
h log --no-walk=unsort
e
d
,
w
hich avoids sor
t
ing
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Mar
t
in von Zweigbergk
add tests for 'git reb
a
se --keep-emp
t
y'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
tin von Zweigbergk
che
r
r
y
: remove redundant
c
h
eck for
merge co
m
mi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mart
i
n v
o
n Z
w
eig
b
ergk
cherry
:
don'
t
set
ignored rev
_
info options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Mart
i
n
von Zwei
g
b
e
rg
k
remove unn
e
cessary pa
r
am
e
ter from get_p
a
tch_
i
ds()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Z
w
ei
g
ber
g
k
add tes
t
case f
o
r rebase o
f
empty commit
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in von Zwei
g
berg
k
a
m
: don't c
a
l
l
mailinfo if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am --rebasing: get pa
t
ch bo
d
y fr
o
m commit, not f
r
o
m
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin v
o
n Zweig
b
e
r
gk
rebase --ro
o
t: print usage on too many args
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von Zweigbergk
rebase: don't source git-sh
-
se
t
up twice
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n von
Z
weig
b
ergk
t3401: use test_commit i
n
setu
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zw
e
igbergk
t34
0
1: moderniz
e
style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin v
o
n
Zweigbergk
am: do
n
'
t persist ke
e
pcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin v
o
n Zweigbergk
remote:
o
nly update remote-tracking branch
i
f updat
i
ng
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
i
n
von Zweigbergk
remote
rename: warn wh
e
n refspec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwe
i
gb
e
r
g
k
remote: "
r
ena
m
e o foo"
s
hou
l
d not rename ref "origi
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweigbergk
remote: write correct fetch
spe
c
wh
e
n r
e
n
a
ming rem
o
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
g
i
tk: Show mo
d
ified
f
i
les with separate
w
ork tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
ti
n
v
on Zweig
b
e
rgk
gitk: Si
m
plify
c
al
c
ulation o
f
gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Z
w
eigbergk
g
itk
:
Ru
n
'git
rev
-
parse --git-dir'
on
l
y
o
n
ce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigbe
r
g
k
g
i
tk: Put tempo
r
ary directory i
n
side
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Fix "Exter
n
al diff" with separate w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwei
g
bergk
gitk: Fix
"
blame parent commit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
gitk: Fi
x
"show or
i
g
i
n
o
f this line" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigbergk
g
itk: F
i
x f
i
le highlight when run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
von Zweigbergk
reb
a
se: cla
r
if
y
"
restore t
h
e original
b
ranch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
a
rtin vo
n
Zweigbe
r
gk
Documentati
o
n: use
[
vers
e
] for SYNOPSIS se
c
ti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mart
i
n von Zwe
i
gbergk
diffc
o
re-re
n
a
m
e: don't c
o
nsider
u
nmerged path
as sourc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zwe
i
g
bergk
r
e
base:
d
efi
n
e options in OP
T
I
O
NS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigb
e
r
gk
Makefi
l
e: do not inst
a
ll s
o
urced r
e
base scrip
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zw
e
i
g
b
e
rgk
mer
g
et
o
ol
:
don't skip modify/
r
e
move conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zwei
g
bergk
r
e
r
ere "
r
em
a
ining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
u
s
e
@{upstream}
i
f
no ups
t
r
eam sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
e
base -i: rem
o
v
e
unnecessary sta
t
e
rebase-
r
o
ot
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: don't
read unused variable p
r
eserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
git-r
e
b
ase--am: remove unnecessar
y
--3wa
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
rebase -m: don
'
t prin
t
ex
i
t code 2 when mer
g
e fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -
m
: re
m
ember
a
ll
o
w_
r
erer
e
_autoupdat
e
o
ption
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: reme
m
ber str
a
tegy and stra
t
egy
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remember ver
b
ose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zw
e
igberg
k
r
e
base: extrac
t
code for writing ba
s
ic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigb
e
rgk
rebase: factor out s
u
b command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
eigb
e
rgk
rebas
e
: make -v
a
t
i
ny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von
Z
w
eig
b
ergk
rebase -i:
a
l
ign variable name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
r
e
base: show consistent co
n
flict resolution
h
i
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reb
a
se: ext
r
act am co
d
e to n
e
w so
u
r
ce fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extract
merge code
t
o new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
e
b
ase: re
m
ove
$
branc
h
as
synon
y
m
f
or $orig_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: factor ou
t
r
e
ference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von
Z
weigb
e
r
g
k
rebase
-i
:
suppo
r
t --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase:
re
o
rder validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
r
eb
a
se: factor ou
t
call
t
o pre-rebas
e
ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -i: remo
v
e now unne
c
essary d
i
rectory chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
se: factor out
c
le
a
n w
o
r
k tree c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Z
weigberg
k
rebase:
f
a
ctor ou
t
comma
n
d
l
i
ne option
proc
e
ss
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in von Zweigbergk
rebase: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbe
r
gk
reb
a
se: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: stricter check of stan
d
alone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gb
e
rgk
rebase: act o
n
co
m
ma
n
d li
n
e out
s
ide par
s
ing
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
re
b
ase: improve d
e
tecti
o
n of rebase in
progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: re
m
ove unused rebase
s
tat
e
'prev_
h
ea
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweigbergk
rebase: read s
t
ate outside loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
reba
s
e: refactor reading o
f
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rg
k
re
b
ase: clearer names fo
r
d
i
rectory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
i
n
von
Zwe
i
gbergk
co
m
pletion: add mis
s
ing co
n
figuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
weigbergk
Use
r
e
f
log in 'pull -
-
reba
s
e
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in
v
on Zw
e
i
g
bergk
rebase: o
n
ly show stat if c
o
nfi
g
ured
t
o true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbergk
rebas
e
-
-abort: do not update branch
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von Zw
e
i
g
berg
k
reb
a
se: su
p
p
ort --veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in von Zweigbergk
Document
a
tion
/
git
-
pull: c
l
ari
f
y configuratio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebase -X: do not
c
lob
b
er
s
trate
g
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree