repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
document that statusHints affects git checkout
2012-09-18
Ma
r
tin von Zweigbergk
rebase usage:
subcommands can not be combined with
-i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin
von Zweig
b
ergk
cherry-pick
/
revert: respect or
d
er of revi
s
i
ons
to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
dem
o
nstrate brok
e
n 'git cherry-pi
c
k three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von
Z
weigbergk
teach log --no-wal
k
=unsorted, which avoids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Mart
i
n von Zweigbergk
add tests for 'gi
t
reba
s
e --
k
ee
p
-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zweigbergk
cherry: re
m
ove redundant check for merge co
m
mit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Marti
n
v
o
n Zwei
g
bergk
cherry: don't set igno
r
ed rev_info opti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin
von Z
w
e
i
gbergk
re
m
ove unnecessary par
a
mete
r
fr
o
m get_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mart
i
n von Zweigbergk
add
t
est case for r
e
base of em
p
ty commit
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von Zweig
b
er
g
k
am: don't
c
all mailin
f
o
if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on
Zweigbe
r
gk
am --rebasing: get patch
b
o
dy
f
r
o
m commit
,
n
o
t from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n
Z
weigbergk
rebase --root: print usage on too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zweigb
e
r
g
k
rebase: don't s
o
urce git-
s
h-setup twice
commit
|
commitdiff
|
tree
2011-12-12
M
a
rtin
v
on Zw
e
igberg
k
t3401: use test_comm
i
t in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigb
e
r
g
k
t3401
:
m
o
dernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin vo
n
Z
weigber
g
k
am:
do
n
'
t pe
r
sist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigb
e
r
g
k
remote: only u
p
date
r
e
mote-trac
k
ing branch if u
p
dating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von
Z
weigb
e
rgk
r
e
mote re
n
ame: war
n
when r
e
fspec wa
s
n
o
t
updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
von Z
w
eigbergk
remote: "rename o
f
oo" s
h
ould n
o
t re
n
ame
r
ef "o
r
igin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
vo
n
Zweigbergk
rem
o
t
e
:
write correc
t
fet
c
h s
p
ec when renaming rem
o
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
g
itk: Show
modified file
s
with separate wor
k
t
r
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
g
i
t
k: Simp
l
ify calculati
o
n of g
i
t
d
i
r
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
i
g
berg
k
gitk: Run 'git re
v
-parse
--git-dir
'
only
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
o
n Zweigber
g
k
g
itk:
Put
t
e
mporary directory
i
nside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zweigbe
r
gk
gitk: Fix "External diff
"
w
i
th se
p
ara
t
e work tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk:
F
ix "blame pare
n
t com
m
it" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
gi
t
k:
F
i
x "show origi
n
of this line" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigbergk
gitk
:
Fix fil
e
h
i
ghligh
t
w
hen ru
n
in subdi
r
ect
o
ry
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zweigbergk
rebase: clar
i
fy "restore the original b
r
anch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin vo
n
Zwe
i
gberg
k
Document
a
tion
:
use [ve
r
se]
for SYNOPSI
S
sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mart
i
n vo
n
Z
w
eigb
e
rgk
diffcore-rename: don't consider u
n
me
r
ged pa
t
h as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Ma
r
tin von Zw
e
i
gbergk
rebase:
d
efine o
p
tio
n
s in OPTIONS_S
P
EC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbergk
Ma
k
efile: do not install sourced
rebas
e
scri
p
ts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
v
o
n Zweigbergk
mergetool: don't
s
k
i
p
mod
i
fy/r
e
move conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbe
r
gk
r
erere
"remainin
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: use
@
{ups
t
ream} if no upstream spe
c
ified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
ebase -i: remove unnecessary sta
t
e rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in vo
n
Zweigbergk
rebase -
i
:
don't
r
ead un
u
sed variable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git
-
r
e
b
a
se--am: remove unnecessary --3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
as
e
-m:
don't print exit code 2 whe
n
merge f
a
ils
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
bergk
r
eb
a
se -m
:
remember allow_re
r
ere_aut
o
update option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
reb
a
se: remember strategy and
s
t
r
a
t
e
g
y opti
o
ns
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
o
n Zwei
g
ber
g
k
rebase: remem
b
e
r
v
e
rbos
e
opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
ex
t
ract code for writing b
a
s
i
c state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: fac
t
or out sub
c
ommand handling
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:
mak
e
-v a t
i
ny
bit m
o
re verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Zweigb
e
rgk
rebase
-
i: ali
g
n v
a
r
i
able
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
rebase:
show consistent c
o
nflict resol
u
tion hin
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zweig
b
erg
k
rebase: ext
r
act am code to new so
u
rce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigb
e
r
gk
rebase: extract
m
erge code to new
s
o
u
rce
f
ile
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Z
w
eigbergk
rebase: re
m
ov
e
$branch as synonym
for $o
r
ig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zwe
i
gbergk
rebase: facto
r
out reference
p
a
r
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase -i:
s
uppo
r
t --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigbergk
rebase: reorder
v
alidatio
n
step
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
r
e
ba
s
e
: factor out call to pre-reb
a
s
e hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase -i: remov
e
n
o
w unnecess
a
ry directory ch
e
cks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Z
w
ei
g
b
e
rgk
rebase
:
f
a
ctor
o
ut clean
w
ork tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rti
n
von Zweigb
e
rg
k
re
b
ase: f
a
ctor out com
m
and l
i
ne option
p
rocessi
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
g
bergk
rebase: al
i
g
n
var
i
able conte
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zweigb
e
rgk
re
b
ase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
r
eba
s
e
:
stricter
c
heck of
s
tan
d
alo
n
e sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
reba
s
e: act on command line outsid
e
p
arsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
w
eigbergk
r
e
base: i
m
prove detection of re
b
as
e
in p
r
ogress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigber
g
k
rebase: remo
v
e unused re
b
ase state 'prev
_
head
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weig
b
ergk
rebase: read s
t
ate
o
utside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
ti
n
von
Z
weigbergk
rebas
e
: re
f
actor readin
g
of
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: clearer
names for directory var
i
ables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Mar
t
in von Zw
e
igbergk
completion: add missing con
f
iguration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zw
e
igbergk
Use reflog in '
p
ull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin von Zwe
i
g
bergk
re
b
ase: only
s
how s
t
a
t
if configured
to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigb
e
rgk
rebase --abort:
do no
t
update branc
h
ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zweigbergk
r
ebase
:
s
uppo
r
t
-
-verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin
v
on Zweigbergk
Documentat
i
on/git-pull: c
l
arify configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Marti
n
von Zweigbergk
r
e
ba
s
e
-
X
: do
n
ot
cl
o
bber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree