repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
format-patch: pick up branch description when no ref is specified
2012-08-30
Martin
v
on Z
w
eigbergk
cherry-pick/reve
r
t: respect
order
o
f revisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n v
o
n Zwe
i
g
b
ergk
demonstrate broken 'git
che
r
r
y-p
i
ck three one t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
v
on Zweigbe
r
g
k
teach log --
n
o-walk=unso
r
ted, wh
i
ch av
o
ids sorti
n
g
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Z
w
e
i
gberg
k
a
d
d tests for
'
g
i
t rebase --keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin
v
o
n Zweigberg
k
add te
s
t
ca
s
e for rebase of empty
c
omm
i
t
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
tin
v
on Zweigber
g
k
am: don't call mailinfo if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zweigbergk
am --rebasing: get p
a
tch b
o
dy
from commit,
n
ot from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von Zweigbe
r
g
k
reb
a
s
e
--r
o
ot: print usage
on
t
oo many arg
s
commit
|
commitdiff
|
tree
2012-06-26
Martin von Z
w
e
igbergk
r
eb
a
se:
do
n
't
s
ource g
i
t
-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
o
n Zweigber
g
k
t3401
:
us
e
test_commi
t
in set
u
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin
von
Z
weig
b
er
g
k
t3401:
modern
i
z
e
s
t
yle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin
von Zweigbe
r
g
k
am: don
'
t pe
r
sist keepcr fl
a
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von Zweigbergk
re
m
ote:
only up
d
ate re
m
ote-trac
k
ing branch
i
f updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zweigbe
r
gk
r
emote
ren
a
me: warn when ref
s
pec was not updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zwei
g
b
ergk
r
em
o
te:
"
rename o f
o
o" shou
l
d not rename ref "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zw
e
igbergk
remote: wri
t
e correct fetch spec wh
e
n renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
g
itk:
S
h
ow modified f
i
l
e
s with separate wor
k
tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von
Zweig
b
ergk
gitk: Simpl
i
f
y calculation of git
d
ir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk:
R
u
n 'g
i
t rev
-
parse --g
i
t-di
r
' o
n
ly onc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweig
b
ergk
gitk: Put
temporary directory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on
Z
we
i
gbergk
g
i
tk: Fix
"External
di
f
f" with separate work tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
i
n von Zwe
i
gbergk
git
k
: Fix "
b
lame
par
e
nt commit" with separate wo
r
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
v
o
n
Zweigbergk
gitk: Fix "show origin
o
f this
l
ine" with
separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigbergk
g
i
t
k
: Fix file
hi
g
h
l
ight when run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
von
Z
w
e
igb
e
rgk
rebase: clar
i
fy "r
e
store the original br
a
nch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweigbergk
Documentation:
us
e
[verse] for SYNOPSIS
section
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin
v
on Zwei
g
bergk
diff
c
ore-
r
ename:
d
on'
t
consider unmerged
pat
h
as s
o
urce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin vo
n
Zwe
i
gbergk
rebase:
define options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
arti
n
von Z
w
eigbergk
Makefile: d
o
not install
s
ou
r
ced reb
a
se scri
p
ts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Z
w
e
igbergk
merg
e
tool: don't skip
m
odi
f
y/
r
emove conflic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
on Zw
e
igbergk
r
e
rere "remai
n
ing"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n
vo
n
Z
w
e
i
gbergk
r
ebase: use @{upstream} if
no upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase -i: re
m
ove
unnecessary stat
e
r
e
ba
s
e-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
vo
n
Zweigberg
k
rebase
-i: don't read unu
s
ed variable preserve_
m
erges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-rebase--am:
r
e
move unnecessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
v
on Zweigbergk
r
e
b
ase
-
m
:
don't print exit
c
o
de 2 when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
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 Zwei
g
bergk
rebase:
rememb
e
r stra
t
egy
a
nd st
r
ateg
y
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Z
w
e
i
gbergk
rebase: remember
v
erbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on
Zweigber
g
k
rebase
:
extra
c
t co
d
e for
w
riting basic
s
tat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
rebase: f
a
ctor out sub
c
ommand handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigbergk
rebase
:
make
-v
a
tiny bit
more
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
ei
g
be
r
g
k
reb
a
se -i
:
align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase:
s
how cons
i
st
e
nt conflic
t
r
e
solut
i
on hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
re
b
a
se: extract am c
o
de to new source f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase
:
e
x
t
ract merge cod
e
to
new sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zw
e
igber
g
k
rebase: remove $branch as
s
ynonym
f
or $orig_hea
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
factor out r
e
fe
r
ence
p
a
r
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase -i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weig
b
ergk
reba
s
e:
r
eorder
val
i
dation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigb
e
rgk
r
ebas
e
: f
a
ctor out call
t
o
pre-reb
a
se
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweigbergk
rebase -i: remove
now
unnecessary directory chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in vo
n
Zweigbergk
r
eb
a
s
e
:
f
actor
o
ut c
l
ean
w
o
r
k tr
e
e check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von
Z
weigber
g
k
re
b
ase: fac
t
o
r out com
m
and line option processin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: alig
n
v
ariable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
g
b
e
rgk
rebase:
a
l
ign v
a
riable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
reba
s
e:
stri
c
t
er ch
e
ck
o
f stand
a
l
o
ne sub comman
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweigbergk
rebas
e
: ac
t
on command
l
i
n
e
o
utside parsin
g
lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von
Z
w
eigbergk
r
e
b
a
se: improve detection of
r
e
b
ase in progres
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zweigbe
r
gk
reba
s
e: remove
u
nus
e
d
reba
s
e 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 Zweigbergk
reba
s
e
: read state outsi
d
e loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigb
e
rgk
r
ebase: refactor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
i
gb
e
rgk
re
b
a
s
e:
c
l
earer
n
ames for dire
c
tory variabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin vo
n
Zweigbe
r
gk
complet
i
on: add
mi
s
sing configur
a
tion
v
a
r
iables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigb
e
rgk
Use r
e
f
l
og i
n
'p
u
ll --reba
s
e
.
f
o
o'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von Z
w
eig
b
er
g
k
rebase: only show stat if
c
onfigured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
rtin v
o
n Zweigbergk
rebase --a
b
or
t
: 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
igb
e
rgk
rebase: support
-
-
v
erify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zw
e
ig
b
ergk
Do
c
umen
t
ation/git-pul
l
: clarify confi
g
u
r
ati
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
r
tin von Z
w
e
i
g
bergk
rebase -X:
d
o not clobber strat
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree