repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase: don't source git-sh-setup twice
2012-06-26
Mar
t
in vo
n
Zweigbergk
reba
s
e: don't source git-
s
h-setup t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin vo
n
Zweigbergk
t3401: use test_c
o
m
m
i
t
in setup
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-12-12
M
a
rti
n
von Zweigbergk
t
3401: modernize sty
l
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-12-09
M
artin v
o
n Zweigbergk
am
:
do
n
't pers
i
st keepcr fl
a
g
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Martin v
o
n Zweigbergk
remote: only
u
pda
t
e
remote-track
i
ng bra
n
ch
if updating
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remote rename
:
warn
when refspec was
not
u
pdated
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in
v
on Zweigbergk
re
m
ote: "renam
e
o foo" should n
o
t renam
e
ref "origin
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zweigbergk
remote: write correct fet
c
h
s
pec when renamin
g
remot
e
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zweigbe
r
gk
gitk
:
Show mo
d
ified fil
e
s with separate wor
k
tre
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zw
e
igbergk
gitk
:
Simpli
f
y calculati
o
n of gitdir
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von
Z
we
i
gb
e
rgk
gitk:
Run 'git rev-p
a
rse --
g
i
t-dir' only once
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zwe
i
gbergk
gitk: Put
t
emp
o
r
a
ry
d
irector
y
in
s
i
d
e
.
git
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigberg
k
gitk: F
i
x "External
diff" wi
t
h separate
work
tree
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
M
artin
v
on Zweigbergk
gitk: Fix "blame pare
n
t commit"
w
it
h
separate work
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Fix "show ori
g
i
n
of this line" wit
h
separ
a
t
e
.
.
.
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Z
w
eigb
e
rgk
git
k
:
Fi
x
f
i
le highl
i
ght when run
i
n s
u
bdi
r
ectory
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-14
Martin
von Zw
e
igbergk
rebase: clari
f
y "rest
o
re the original branc
h
"
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-07-06
M
arti
n
von Zweigbergk
Docum
e
nta
t
ion: use [v
e
rse] for SYNOP
S
IS sections
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigber
g
k
diffcore-rename: don't consider unmerged
p
ath
a
s source
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-03-05
M
artin von Zweigbergk
rebase: define options in OPTIONS_SP
E
C
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-25
Mart
i
n von
Z
weig
b
ergk
Makefile: d
o
n
ot install s
o
urced rebase s
c
ripts
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Z
we
i
gbergk
mergetool: don't s
k
ip mo
d
if
y
/remove conflicts
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Zwe
i
gbe
r
g
k
rerere "remaining"
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zwei
g
b
er
g
k
rebase: use @{upstream} if n
o
upst
r
eam specified
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase -i: remove unnecessary sta
t
e r
e
base-root
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zw
e
igbergk
r
eb
a
se
-i
:
don't r
e
ad unused
varia
b
le p
r
eserve_me
r
ges
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
git-rebase
-
-am: re
m
ove unnecessa
r
y --3wa
y
o
p
tion
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwei
g
berg
k
rebase -m: don't print e
x
it code 2 when merg
e
fai
l
s
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase -m: re
m
ember allow_rerere_auto
u
pdate option
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigb
e
rgk
rebase: remembe
r
strategy and
str
a
tegy options
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
g
b
ergk
reba
s
e: remember
v
e
r
b
o
se
o
ption
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Z
w
eigbergk
rebase: extract
c
o
d
e for writi
n
g basic state
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwe
i
gbergk
rebase: factor out sub command handling
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
r
e
base: m
a
ke -v a tiny bit
more verbose
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
berg
k
re
b
ase
-i: align v
a
riable names
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweig
b
ergk
rebase: sho
w
c
onsistent conflict resolu
t
ion hint
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase: ext
r
ac
t
am code to new source file
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
e
xtract merge code to ne
w
s
ource fi
l
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Z
w
e
igbergk
rebas
e
:
r
emove $branch as synonym for $
o
rig_
h
e
ad
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in
v
on
Z
w
e
igbergk
rebase: factor out reference parsing
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zweig
b
ergk
rebase -i: support
-
-stat
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: reorder valid
a
tion
steps
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in von Zweigbergk
rebas
e
: factor o
u
t call to pr
e
-re
b
ase hook
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigberg
k
rebase -i:
r
e
move now unnec
e
ssary di
r
ectory ch
e
cks
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
we
i
gber
g
k
rebase: factor out clean wo
r
k t
r
ee chec
k
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: factor o
u
t
command
line option processing
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n Zweigbergk
rebase: al
i
gn
var
i
able content
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebas
e
: align var
i
a
ble names
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
r
gk
re
b
ase
:
stricter c
h
eck of stand
a
lone sub command
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n Zweigbergk
rebase: act on command
line out
s
ide
parsing
loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbe
r
gk
rebase: improve detection of
re
b
as
e
in progress
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on
Z
w
e
igber
g
k
rebase: remove
unu
s
e
d
r
e
base state 'prev_
h
ea
d
'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: read s
t
ate outside loop
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: refact
o
r reading of sta
t
e
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Z
w
e
ig
b
ergk
reba
s
e
:
clearer names
for director
y
variables
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-12-21
Marti
n
von Zw
e
igbergk
completion:
a
dd
missing conf
i
guration variabl
e
s
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
Use r
e
flog in 'pull
--rebase
.
foo'
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-29
M
artin von Zweigbergk
rebase: only s
h
o
w
stat if co
n
f
i
gured to
t
rue
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-24
M
artin von Zweig
b
ergk
rebas
e
--abort: d
o
not update bran
c
h
ref
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-23
Martin von
Zweigbergk
rebase: supp
o
rt --
v
erify
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbe
r
gk
D
ocum
e
ntation/git-pull: clar
i
f
y
configuration
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von Zweigbergk
re
b
a
s
e -X:
do not clobber strateg
y
... Martin von Zweigbergk <
martin.von.zweigbergk@gmail.com
>
commit
|
commitdiff
|
tree