repo.or.cz
/
git.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/dotdot-is-parent-directory' into maint-1.7.11
2012-08-09
M
artin von Zwei
g
bergk
add tests fo
r
'g
i
t rebase
-
-keep-
e
m
pty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
artin v
o
n Zweigbergk
a
dd test case
f
o
r rebas
e
of empty com
m
it
commit
|
commitdiff
|
tree
2011-12-12
M
a
r
t
in von Zwei
g
bergk
t3401: use tes
t
_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
o
n
Zwei
g
bergk
t3401: modernize
s
ty
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
a
rtin von Zweigbergk
am
:
don't persist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von
Zweigbergk
remot
e
:
o
nly
update rem
o
t
e-track
i
ng b
r
an
c
h
i
f updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zwe
i
gb
e
rgk
remote
re
n
ame: warn wh
e
n r
e
fspec
w
as
n
ot updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin vo
n
Z
weigbergk
remote
:
"
rena
m
e
o
foo" should not
re
n
a
me ref
"or
i
gin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
in
von Zweigber
g
k
rem
o
te: w
r
i
te correct fetch spec whe
n
rena
m
ing remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n
Zweigbergk
gitk:
Show modified
f
iles
with s
e
parate
work t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n vo
n
Z
w
eigbergk
git
k
: Simplify calculation of
g
itdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zw
e
igb
e
rgk
gitk: Run
'git rev-p
a
rse --git-dir
'
onl
y
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zweigbergk
gitk: Put tem
p
orary directory
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Z
w
eigberg
k
gitk: Fix "External
d
iff" with s
e
parate w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Fix "blame parent
commit" with se
p
a
rate wor
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Z
weigb
e
rgk
gitk: Fix "show origin of this lin
e
"
w
ith
sep
a
rate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
gitk: Fix file h
i
ghlight
w
h
en run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Mart
i
n v
o
n Zweigbergk
rebase:
cla
r
if
y
"
r
e
store
the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von
Zwei
g
bergk
Documentation: use [verse] for SYNOPSIS section
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
a
rt
i
n von
Zw
e
i
gbe
r
gk
di
f
fcor
e
-
rename: don'
t
consi
d
e
r
u
n
merged
path
a
s source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigbergk
rebase:
d
efi
n
e opti
o
ns in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin
von Zwe
i
gbergk
Mak
e
fi
l
e: d
o
not install
s
ourced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zwei
g
bergk
merge
t
ool: d
o
n'
t
ski
p
modify
/
remove conflic
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mar
t
in vo
n
Zwei
g
bergk
rer
e
re "
r
em
a
in
i
ng"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: use @{u
p
stream} i
f
no
u
pstream s
p
ecified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
v
on Zweigbergk
reba
s
e -i: r
e
move
u
nnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebas
e
-i: don't r
e
a
d
unused v
a
riable pr
e
serve
_
m
e
rges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-rebase--am: remove
u
nne
c
essar
y
--3w
a
y opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase -m: don't print exit co
d
e 2 when merg
e
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zw
e
i
g
b
e
rgk
r
ebase -m:
reme
m
be
r
allow_rerere_a
u
toupda
t
e
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
r
ebase: re
m
ember
st
r
ategy and strategy op
t
io
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
r
e
member verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zweig
b
ergk
r
ebase: extract code for w
r
iting basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n Zweigbergk
rebas
e
: facto
r
out
s
ub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von
Zweigbergk
rebas
e
: mak
e
-v a tiny bit mo
r
e verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
reb
a
se -i
:
a
lign variable n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
reb
a
se: show consist
e
n
t conf
l
ict res
o
lution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigbergk
re
b
ase
:
ext
r
act am code to new so
u
rc
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rg
k
rebase: extract m
e
rge
co
d
e
to new so
u
rce
f
ile
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwe
i
gbergk
rebase: rem
o
ve
$b
r
anch as s
y
nonym
f
or $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in
v
o
n
Zweigbe
r
gk
reba
s
e: f
a
cto
r
out reference parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweig
b
ergk
rebase -i: suppo
r
t
-
-stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
i
gbe
r
gk
rebase: r
e
order validation
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
ergk
r
ebase: fa
c
tor out c
a
ll to
p
re-r
e
b
ase
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
er
g
k
rebase
-
i: remove now unnece
s
s
a
ry directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbe
r
gk
r
e
b
ase: factor out clean
wor
k
tr
e
e check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
r
ebase: factor out co
m
man
d
li
n
e opti
o
n pro
c
essing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align
v
ariable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
v
o
n Zweigbergk
rebase:
a
lign vari
a
ble names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
weigbergk
rebase:
s
tricter chec
k
of standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbe
r
gk
rebase:
a
ct on co
m
mand line outsi
d
e
parsing
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase:
imp
r
ove dete
c
tion of rebase in pro
g
ress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
gberg
k
r
e
bas
e
: remove u
n
used rebas
e
stat
e
'pr
e
v_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
reb
a
se: read st
a
te ou
t
s
i
de
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rg
k
rebase: r
e
fact
o
r reading of
sta
t
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zw
e
igb
e
rgk
re
b
ase: clearer names for
d
irectory v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
tin vo
n
Zw
e
igbergk
c
o
mpletion: add mis
s
ing
c
o
n
figuratio
n
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
v
on
Z
we
i
gbergk
Use reflog in '
p
ull --r
e
base
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin vo
n
Zweigbergk
reba
s
e
:
only sho
w
stat if
c
onfigured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
rti
n
von Zweigbergk
rebase --abort: do not upda
t
e
branch
re
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweig
b
ergk
r
ebase: suppor
t
--verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Marti
n
von Zweigbergk
Documentation/git-pull
:
c
l
arify configura
t
i
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Ma
r
tin von
Zweigbergk
rebase
-
X: do not clob
b
er strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree