repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Start preparing for 1.7.12.3
2012-08-30
Marti
n
von Zweigbe
r
gk
cherry-pic
k
/revert
:
respec
t
order of re
v
isions
to
p
ic
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin v
o
n Zweigbergk
d
emonstrate
b
roken 'gi
t
cherry
-
pick
three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zwei
g
bergk
teac
h
log
--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 von Zweigbergk
add tests for 'git
r
ebase -
-
keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mar
t
i
n
vo
n
Zwei
g
b
ergk
add
t
est case fo
r
rebase
o
f
empty commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zwe
i
gber
g
k
am: don't call mail
i
nfo if
$rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Z
w
eigber
g
k
a
m
--rebasing:
g
e
t
patch b
o
d
y from commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rt
i
n von Zweigb
e
rgk
r
e
base --root: print usage on t
o
o ma
n
y arg
s
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n von
Z
we
i
gber
g
k
rebase:
d
on't sou
r
c
e
g
it-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin von
Z
w
eigber
g
k
t3401: use test_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin v
o
n
Zweigb
e
rgk
t
3
401:
m
o
dernize st
y
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin v
o
n Zweig
b
ergk
am:
d
on't per
s
i
s
t keepcr fl
a
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in
v
on Zweigberg
k
r
e
mote: only update remot
e
-tracking bran
c
h if u
p
dating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igb
e
rgk
remote
r
ename: warn
when refspec was
n
o
t u
p
d
a
t
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
w
e
igbergk
remote: "rename o foo" should not rename ref "o
r
igin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zwe
i
gbe
r
gk
remote: w
r
ite correct
f
etch spec when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbe
r
gk
gitk:
S
how modified files
w
ith separate work tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zwei
g
bergk
g
i
t
k
: Simpl
i
f
y ca
l
culation
o
f g
i
t
dir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in v
o
n Zw
e
igbergk
gitk:
R
un 'git rev-parse --git-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
gitk:
P
ut temporary director
y
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
w
ei
g
bergk
g
itk: F
i
x "External
d
iff
"
with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n vo
n
Z
w
ei
g
bergk
gitk: Fi
x
"blame pare
n
t com
m
it" with separ
a
te work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zweigbergk
gitk: Fix "
s
how orig
i
n of this line" with separa
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin v
o
n Zweigberg
k
g
i
tk: Fi
x
file
highlight when run in subdire
c
tory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin
v
o
n Zweigbe
r
gk
rebase: clarify "restore the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von
Z
weigbergk
D
o
cumentation: use [ver
s
e] for SYNOPSIS se
c
ti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigberg
k
diffcore-rename: don'
t
consider unmer
g
ed
path
as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
M
ar
t
in
v
on Zweigb
e
r
gk
rebase
:
define options in OPTIO
N
S_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Marti
n
von Zweigbergk
Makefile
:
d
o
not
install source
d
re
b
a
s
e scri
p
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zwei
g
bergk
merget
o
ol:
don't skip modify/re
m
ove co
n
flict
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von Zw
e
igbergk
rerere
"
rema
i
ning"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweig
b
ergk
r
e
b
ase: use @{ups
t
r
e
a
m} if
no upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n
Z
weigbergk
rebase -
i
:
r
emove unnecessary s
t
ate rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweig
b
ergk
rebase -i: don't
r
ead unused variab
l
e preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
rgk
gi
t
-reba
s
e--am: re
m
ov
e
unnecessary --3way o
p
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigb
e
rgk
re
b
ase
-
m: don't p
r
int exit code
2 when me
r
ge
f
ails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
re
b
a
se -m:
r
emember al
l
ow_
r
erere_auto
u
pd
a
t
e opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Z
w
e
igbe
r
gk
rebase: re
m
e
mb
e
r strategy an
d
strategy o
p
t
i
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
r
eb
a
se: remember
verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
rebase: ext
r
act code for writin
g
b
a
si
c
stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
erg
k
r
ebase
:
factor o
u
t sub command handlin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase: make -v a tiny bit m
o
r
e
v
erbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zw
e
igbergk
rebase -i: alig
n
variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
rebase: show consistent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von
Z
weigbergk
reb
a
s
e
: extra
c
t am code to
new source f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase:
e
x
t
r
a
ct
merge code to new sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in vo
n
Zweigb
e
rgk
rebase: remove $b
r
anc
h
as sy
n
ony
m
for $
o
rig_hea
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin vo
n
Zweig
b
ergk
rebase: factor o
u
t
reference
p
a
r
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on
Z
weigber
g
k
rebase -
i
:
support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
: reorder validatio
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigbe
r
g
k
r
ebase
:
factor out call to p
r
e-r
e
base
h
o
ok
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base -i: remove
now unne
c
essary directo
r
y checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zwe
i
g
b
ergk
rebase: factor
o
ut
c
lean wo
r
k t
r
ee check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e:
facto
r
out c
o
m
mand
l
i
ne op
t
ion processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
v
o
n
Z
w
e
i
gbe
r
g
k
rebase: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase:
a
lign var
i
able n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eig
b
ergk
reb
a
se: stricter check of standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigber
g
k
rebase: act on command lin
e
outsid
e
parsing
loo
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reb
a
s
e
:
impr
o
ve detec
t
ion
of
r
eb
a
se i
n
progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remove unused re
b
ase state 'prev_
h
ead'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase
:
read state
o
utside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
r
e
base: r
e
fa
c
to
r
reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase:
c
lea
r
er names for directo
r
y variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
M
artin
v
on Zweigbergk
comple
t
ion: add
missin
g
c
o
nfiguration va
r
i
a
bl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zwei
g
berg
k
Use reflog i
n
'pull
--rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mar
t
in von Zweigb
e
rgk
rebase: onl
y
show stat if configur
e
d to t
r
ue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbe
r
gk
rebase --abort:
do not update
b
ranch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
artin v
o
n Zweigbergk
rebase
:
suppo
r
t --veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zwei
g
b
ergk
Docum
e
ntation/git-pull: clarify configurat
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin vo
n
Zweigbergk
rebase -X: do no
t
clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree