repo.or.cz
/
git
/
mingw
/
4msysgit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
i18n: am: mark more strings for translation
2012-06-27
M
artin
von
Z
weig
b
erg
k
add test case for reb
a
se of
e
mpty
commit
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
a
m
:
don't call mailinfo i
f
$reba
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigberg
k
am --r
e
b
asing
:
ge
t
patch
body f
r
om commit, not fro
m
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
rebase
-
-
r
oot:
pri
n
t usage on
t
oo man
y
args
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in von Zweigber
g
k
reba
s
e: don't sourc
e
git-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin von
Z
weigberg
k
t
3
401: use test_commi
t
in se
t
up
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Z
w
eigbergk
t3401
:
modernize sty
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Z
w
e
igbergk
am: don't persist kee
p
cr
f
lag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin v
o
n Zweigber
g
k
remo
t
e: on
l
y
upd
a
t
e
remote-tr
a
ckin
g
b
r
anch
i
f updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
rem
o
te rena
m
e: warn when r
e
fspe
c
was not update
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n
v
on Zweigbergk
remo
t
e: "rename o foo" sh
o
uld not
r
ename
r
ef "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Z
w
eigberg
k
r
e
mote: write correct fetch spec when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Z
weigbergk
gitk
:
Sho
w
modified files with separa
t
e w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n v
o
n Zweigbergk
gitk: Simplify
c
alculation of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Zweigbergk
gitk:
R
un 'g
i
t r
e
v
-
p
arse -
-
g
it-di
r
' o
n
ly on
c
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von
Z
weigbergk
gitk: Pu
t
te
m
porary
d
ire
c
tory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von
Z
w
e
igbergk
g
i
t
k
:
F
i
x
"
External
diff" with
s
e
parate work t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
i
n von Z
w
eigbergk
gitk: Fix
"bla
m
e paren
t
co
m
mit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zw
e
ig
b
ergk
gitk
:
Fi
x
"show o
r
igin o
f
this li
n
e" wit
h
se
p
arate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rt
i
n v
o
n Zw
e
i
g
be
r
gk
gitk: Fix file highli
g
ht whe
n
run in subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
von Z
w
eigb
e
rgk
rebas
e
:
c
lari
f
y "r
e
store the
or
i
g
i
na
l
br
a
nch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
ar
t
i
n von Zweigbe
r
gk
Documentat
i
o
n
:
use [
v
e
r
se] for SYN
O
PSIS se
c
ti
o
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von
Z
weigbergk
diffcore-rename
:
d
on'
t
conside
r
unmerg
e
d path as s
o
urc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
v
on Zweig
b
ergk
rebase: d
e
fin
e
options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin v
o
n
Zweigbergk
Makefile: do not install sou
r
c
e
d rebase
sc
r
i
p
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
ti
n
von Z
w
eigber
g
k
mergetool: d
o
n't skip mo
d
ify/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rtin von
Z
w
eigbergk
rer
e
re "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase: use @{upst
r
e
a
m} if no ups
t
ream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
r
eba
s
e -i: re
m
ove unnecessary
state
r
ebase-ro
o
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
we
i
g
b
erg
k
rebase
-
i
:
d
o
n't read un
u
sed variable
preserve_mer
g
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
git-rebase--am
:
remove unn
e
cessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigb
e
rgk
r
ebase -m: don't p
r
int exi
t
c
ode 2 wh
e
n merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Z
w
eigbergk
reb
a
se -m: rememb
e
r allow_rerere_au
t
oupdate
optio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
eig
b
erg
k
reba
s
e: remem
b
e
r stra
t
e
g
y and strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase: remembe
r
verbose
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
von Zweigb
e
rgk
rebase: e
x
tra
c
t
cod
e
for writing
basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
rebase: factor ou
t
sub
com
m
and
han
d
ling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigberg
k
rebase: make -v
a tiny bit m
o
re verbo
s
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zwe
i
gbergk
re
b
ase -
i
:
align va
r
iable
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: show consiste
n
t conflict resolutio
n
hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigbergk
rebase: ex
t
rac
t
am cod
e
to new
s
o
u
r
c
e
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: ex
t
r
act mer
g
e
co
d
e to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebase: re
m
ove $branch as synon
y
m
f
or $orig
_
h
e
ad
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Z
weigber
g
k
rebase: fac
t
or o
u
t reference
p
ars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von
Zweigbergk
r
ebase -i:
s
u
pp
o
rt
-
-
s
t
at
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigb
e
rgk
rebas
e
: reorder validatio
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on Zweigbergk
r
e
b
ase: factor o
u
t
ca
l
l
t
o pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebas
e
-i: remove no
w
unnecessary directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
art
i
n von Zweigbergk
r
ebase: factor
out clean
w
ork tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
on Zweigbergk
r
ebase: factor out comm
a
n
d
line option p
r
ocessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zweigbergk
rebase: align va
r
iable c
o
n
t
ent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
b
ase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
: stri
c
ter
c
heck of standalone sub co
m
mand
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Z
w
eig
b
ergk
rebase: ac
t
o
n
c
om
m
a
n
d lin
e
o
utside parsing
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n
Zweigbergk
rebase: improve
d
etection of re
b
ase
i
n progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: remove
unu
s
ed
rebase state
'prev
_
hea
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zwei
g
bergk
rebase: read state ou
t
s
i
d
e
loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
rebas
e
: refactor reading
of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
rebas
e
:
c
le
a
rer nam
e
s for director
y
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
v
on Zweigbergk
completion: add missin
g
configuration
v
aria
b
les
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
art
i
n v
o
n
Zwe
i
gbergk
Us
e
reflog in 'pu
l
l
--r
e
base
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
t
in
von Zweig
b
ergk
rebase
:
only show sta
t
i
f c
o
nfig
u
red t
o
tru
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Z
w
eigb
e
rgk
rebase
-
-abort: do no
t
update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
artin v
o
n
Zweigbe
r
gk
rebase: sup
p
ort --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
artin von Zweigbergk
Documen
t
ation/git-pull: clarify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
rt
i
n von Zweigberg
k
re
b
ase -X: do no
t
clobber st
r
a
tegy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree