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
Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
2012-08-09
Martin von Zweigbergk
add
tests for 'git re
b
ase --keep-e
m
p
t
y'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Ma
r
tin von
Z
weigbergk
a
d
d t
e
st
case for rebase of empty commi
t
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbe
r
gk
t340
1
: use te
s
t
_commi
t
in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigbergk
t3401: modernize s
t
yle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweigb
e
rgk
am: don't persis
t
keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remote: o
n
ly update remote-tra
c
king
b
ra
n
ch if updat
i
ng
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rti
n
von Zw
e
igb
e
rgk
remote rename: warn when r
e
fspec
was not upda
t
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigb
e
rgk
re
m
ote: "rename o foo" should n
o
t rename
r
ef "origi
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zwe
i
gbergk
remote: write
cor
r
ect fetch spe
c
when r
e
n
a
ming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweig
b
ergk
git
k
: Show mo
d
i
f
ied
files with separate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk: Simplify calculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
r
tin von Zwei
g
b
e
rgk
gitk: Run 'git rev-parse --git-dir' on
l
y once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
g
i
t
k
: Pu
t
temp
o
rary di
r
ecto
r
y ins
i
d
e
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rti
n
v
o
n Zwei
g
berg
k
gitk: Fi
x
"External
d
i
ff"
w
it
h
separate w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk: Fix "blam
e
parent commit" with s
e
parate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
i
g
berg
k
g
i
tk: Fix "show ori
g
in of
t
h
i
s lin
e
"
w
ith separ
a
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk
:
Fix file highligh
t
when run in
s
ubdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
M
a
rtin vo
n
Z
w
e
i
gbergk
rebase:
c
l
a
rify "res
t
ore t
h
e original br
a
n
c
h"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin
v
on Zwei
g
b
ergk
Documentatio
n
:
use
[
verse] for SYN
O
PSIS sec
t
ions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
diffco
r
e
-
rename:
d
on't
consider un
m
erged path as sourc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
tin
von Zweigbergk
rebase: define options in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
tin von Zweigbergk
Ma
k
efile: do not install s
o
urced rebase
script
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von Zw
e
igbe
r
gk
mergetool: don'
t
skip modif
y
/re
m
ove co
n
f
li
c
ts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin
v
on Z
w
eigbergk
r
erer
e
"remain
i
ng"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase: use @{upstream} if no u
p
stream specif
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in v
o
n Zw
e
igber
g
k
rebase -i: re
m
ove unnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbe
r
gk
reba
s
e
-i
:
don't read u
n
used
variable pre
s
e
rve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in
v
on
Zwe
i
g
b
ergk
git-reb
a
s
e
--am: remove unnecessa
r
y --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zw
e
igb
e
rgk
r
ebase -m: don't print exit code 2 w
h
en merge fai
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
o
n Zweigbergk
reba
s
e
-m
:
remember allo
w
_rerere_autoupdate op
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remember
s
trategy and strategy op
t
io
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
reba
s
e: remember ve
r
b
o
se
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
reba
s
e:
e
xtr
a
ct code for
w
r
iting basic st
a
te
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase:
f
a
ctor
o
ut sub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigber
g
k
rebase: make -v a tiny
b
it more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweigbergk
reb
a
se -i
:
align variab
l
e names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweig
b
ergk
rebase: show
c
on
s
istent conflict
re
s
o
lution
h
int
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n Zweigber
g
k
rebase: extract am code to ne
w
source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Z
w
eigbergk
rebase: e
x
tra
c
t merg
e
code to
n
ew sourc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbe
r
gk
r
e
base: remo
v
e $
b
r
anch as
s
yno
n
y
m f
o
r $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: fac
t
or out
r
e
ferenc
e
parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase: re
o
r
der validati
o
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weig
b
e
r
g
k
rebase: factor out cal
l
to pre-rebase ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Z
w
eigbe
r
gk
rebase
-
i: remove now
u
nne
c
essary di
r
ectory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
factor out
clean
w
ork tree c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigber
g
k
r
ebase: factor out
c
ommand line option proces
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zw
e
igberg
k
rebase: align variable con
t
ent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zwei
g
bergk
reba
s
e:
a
l
i
gn variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
r
ebase:
stricter check of standalo
n
e sub
command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
rebase: act o
n
co
m
m
a
nd
line outside parsing lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
ebase: improve de
t
ection of r
e
base in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase:
remove unused rebase state '
p
r
e
v_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: read state ou
t
side
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigberg
k
rebase: refactor reading of s
t
ate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
wei
g
bergk
rebase:
c
learer names
for d
i
rectory
v
ariabl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zw
e
i
gbergk
comp
l
etion:
a
d
d
missing confi
g
uration
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigb
e
rgk
Use
reflog in
'pull
--rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin v
o
n Zweigbe
r
g
k
r
e
b
ase:
o
nly show stat if con
f
igu
r
ed to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin
von Zweigbergk
rebase
-
-abort: do not
u
pdate branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
artin vo
n
Zweigbergk
rebase: support --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in von
Zweigbergk
D
ocumentation/git-pull:
c
larify conf
i
guration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
ar
t
in vo
n
Zweig
b
e
r
g
k
r
ebase
-
X: d
o
n
o
t
clobber stra
t
egy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree