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
Merge branch 'jc/maint-ident-missing-human-name'
2012-08-30
Martin von Zweigb
e
rgk
cherry-pick/revert: res
p
ect order o
f
revisi
o
ns to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Marti
n
v
o
n Z
w
eigbergk
demonstrate
b
roken 'gi
t
ch
e
rry-pic
k
three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigberg
k
t
e
a
ch lo
g
-
-no
-
walk=unsorted, which avoids
s
orting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
rtin
v
o
n Zweig
b
ergk
ad
d
t
e
sts for 'git
r
ebase --keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Ma
r
tin von Zweigbergk
cherry: r
e
move redun
d
ant
check for me
r
g
e
c
om
m
it
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von
Z
weigb
e
rgk
cherry:
don
'
t set ig
n
ored rev_info
o
ptions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin vo
n
Zwei
g
bergk
remove unn
e
cessary paramet
e
r from get_
p
atc
h
_
ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin
von Zweigbergk
a
d
d te
s
t c
a
se for rebase of
e
mpty co
m
mit
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von Z
w
eigberg
k
am:
don'
t
call mailinfo if $r
e
basin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
t
i
n
v
on Zweigbergk
am --
r
e
b
asing: get pat
c
h bo
d
y
f
rom
commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zw
e
igbergk
rebase --root: print usage on
too ma
n
y ar
g
s
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zweigb
e
rgk
rebase: don't source
git
-
sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n von Zweigbergk
t3401
:
use te
s
t_
c
ommit
in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
M
a
rti
n
von Zweigbergk
t3401: m
o
der
n
ize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mar
t
in
v
on Zweigbergk
am:
don't
persist keepcr
flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote
:
only update
r
emote-t
r
a
cking branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zweigber
g
k
rem
o
te
r
ename: warn when ref
s
pec wa
s
not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Zw
e
igbergk
remote: "
r
e
n
ame o
f
oo" sh
o
uld not rename ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
art
i
n von Zw
e
igbergk
remote: write correct fetch spec
w
he
n
renaming
remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zw
e
igberg
k
git
k
:
Show modified files with sepa
r
ate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zw
e
igb
e
rgk
gi
t
k: Simpli
f
y calculati
o
n of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in vo
n
Zweigbergk
git
k
: Run '
g
i
t
rev-parse --git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigberg
k
gitk: Put tempora
r
y directory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zwei
g
bergk
gitk: Fix "External diff" with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin v
o
n Zw
e
ig
b
erg
k
gitk: Fix
"blame parent commit" with separ
a
te
w
o
r
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von
Z
w
ei
g
b
ergk
gitk: Fix "show origin of this li
n
e
"
with se
p
arate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin
von Zweigbergk
gitk: Fix file highlight when r
u
n in subdirect
o
ry
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
v
on Zwe
i
gbergk
rebase: clarify
"
r
estore
the original bran
c
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin
v
o
n
Z
w
eigbe
r
gk
Documentati
o
n: use [verse
]
for SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin
von Zw
e
igbergk
diffcore-rename: 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 Zweigbergk
reba
s
e: define
o
ptions in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Marti
n
von Zw
e
i
g
berg
k
M
a
k
e
f
i
l
e: do
not
i
nst
a
ll sourced rebase sc
r
ipts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von Zweigbergk
merg
e
t
o
ol: d
o
n't skip
m
odify
/
remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von
Z
weigbergk
r
e
rere "re
m
aining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von
Zwei
g
bergk
rebase: us
e
@{upst
r
eam}
i
f no ups
t
rea
m
speci
f
ied
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
v
o
n Zweigbergk
rebase -i:
r
e
move unnecessary
s
tate
r
ebase-root
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
reserve
_
merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-rebase
-
-am: remove
unnecessary
-
-
3w
a
y opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on
Zweigbergk
reb
a
se -m: don'
t
pr
i
n
t
exi
t
c
o
de 2 when
merge fa
i
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -m
:
remember allow_rerere_autoupdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigb
e
rgk
rebase: remember
stra
t
egy and strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: r
e
member v
e
rb
o
se
opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
er
g
k
rebase
:
e
x
tract
c
ode for writin
g
b
asic sta
t
e
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: factor out sub command hand
l
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: make -v
a
t
i
n
y
b
i
t
more
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-i:
a
lign variabl
e
n
a
m
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zweig
b
ergk
rebase: sho
w
consistent conflict resolu
t
ion
h
int
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweig
b
e
r
gk
rebas
e
:
e
xtract
am code to
n
ew source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwei
g
berg
k
rebase: extract merge code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n
Zweigbergk
re
b
a
se
:
r
emove
$br
a
nch as synonym
for $orig_hea
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
r
e
b
a
se: factor out ref
e
rence parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
v
on
Z
weigbergk
rebase -
i
:
s
upport --s
t
at
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweig
b
ergk
rebase: reorder vali
d
at
i
o
n ste
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zwei
g
bergk
rebase:
f
actor
out cal
l
to p
r
e
-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase -
i
: remove
n
ow
unnec
e
s
sary
d
irectory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: facto
r
ou
t
clean work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out command line option
p
rocessin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
vo
n
Zw
e
i
gbergk
r
e
base: align varia
b
le
n
ames
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: s
t
ricte
r
ch
e
ck of standalo
n
e sub comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
e
base: act on co
m
mand
l
ine outsid
e
pa
r
sing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
reb
a
se: improve detection of r
e
base in progre
s
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwei
g
be
r
gk
r
e
base
:
remove unused rebase s
t
a
t
e
'prev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwe
i
gb
e
rgk
r
e
bas
e
:
read state
o
utside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Zw
e
i
g
bergk
r
e
ba
s
e: refactor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
re
b
ase: clearer names for d
i
rector
y
variab
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Z
w
eig
b
ergk
completion:
a
dd missing configurati
o
n variab
l
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
Use reflog in 'pull
--rebase
.
f
oo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von
Z
weigb
e
rgk
rebase:
o
nly show stat if con
f
i
gured
t
o true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Z
w
e
i
gbe
r
gk
reba
s
e --abo
r
t:
d
o not upda
t
e bra
n
ch
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin
v
on
Z
weigbergk
reb
a
se: support --
v
erify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbergk
Doc
u
mentation/git
-
pull:
clarify confi
g
uration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Mart
i
n
v
o
n Zweigberg
k
rebase
-
X: do not clob
b
er strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree