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
Git 1.7.6.2
2011-07-14
Martin von Zweigbergk
rebase: clarify "restore the original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin
v
on Zweigbergk
Documentation: use [
v
er
s
e] f
o
r
S
YNOPSIS se
c
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweigbergk
diffcore-rename: don't
c
onsider unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mar
t
in von Zwei
g
b
ergk
reb
a
se:
d
efine op
t
ions in OPTIONS
_
SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin
v
o
n Zweigbergk
M
a
kefile: do not in
s
tall s
o
urced reba
s
e
s
cripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von Zweigbergk
merget
o
ol
:
don't skip
m
o
d
ify/remove
c
onflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Mart
i
n
von Zweigberg
k
rerere "
r
emaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zweigbergk
rebase: use @{upstream} if no upstream
s
p
ecifie
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von
Zw
e
igbergk
rebas
e
-i:
remo
v
e u
n
necessary
sta
t
e rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweig
b
ergk
rebas
e
-i:
d
on't read unused varia
b
l
e
preserve_merg
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
e
r
gk
git-
r
ebas
e
--
a
m:
remove unnecessar
y
-
-
3
wa
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigb
e
rgk
rebase -
m
:
d
on't print
e
x
it co
d
e
2 when merge fa
i
l
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n
v
on Zw
e
ig
b
ergk
rebas
e
-m:
r
emember allow
_
rerere_a
u
toupda
t
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebase:
r
emember strategy and strategy o
p
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
ergk
r
ebas
e
: remember verbose
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: extract code f
o
r writing basi
c
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
weigbergk
rebase: factor out su
b
comma
n
d handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweig
b
e
r
g
k
rebase: m
a
ke -v a
t
iny bit
m
ore verb
o
se
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigber
g
k
rebase -i: align variab
l
e n
a
m
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
von Zweigbe
r
gk
reba
s
e
:
s
h
ow consistent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: extr
a
ct am code to
n
e
w
source
f
ile
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n
von Zwe
i
gberg
k
reba
s
e: extract merge
code to new source f
i
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remov
e
$branch
a
s
syn
o
nym for
$
o
r
ig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
reb
a
se -i: su
p
port --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigber
g
k
rebas
e
: factor out call to pre-rebase hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eig
b
e
r
gk
rebase
:
fa
c
tor out c
l
e
an work tree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: fa
c
tor out re
f
erenc
e
par
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
r
e
b
ase
:
reo
r
der validation ste
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbergk
rebase -i:
r
e
m
ov
e
now unnecessary di
r
ector
y
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
reb
a
se: factor out command line option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
gbergk
rebase: align variabl
e
con
t
ent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweig
b
e
r
g
k
rebas
e
: alig
n
var
i
able names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
r
e
b
ase: str
i
cter
check o
f
standalone sub
c
o
mmand
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: act
o
n comma
n
d
lin
e
outsid
e
p
a
r
s
i
ng loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigb
e
rgk
rebase:
i
mprove dete
c
t
i
o
n of
rebase in progres
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
rebase: remov
e
u
n
used re
b
ase state
'
prev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Z
weigbergk
re
b
a
se: rea
d
sta
t
e o
u
t
side lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase:
r
efacto
r
reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on Zweigb
e
r
gk
rebase: clearer
names for dir
e
ctory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Marti
n
vo
n
Zweigbergk
completion: add missing configurati
o
n
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Ma
r
tin vo
n
Zweigbergk
Use reflog
in 'pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Z
weig
b
er
g
k
rebase:
o
nly show sta
t
if co
n
fig
u
red to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbe
r
gk
reba
s
e
--abort
:
d
o
no
t
update
b
ranch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mart
i
n
von Zweigbergk
r
ebase: su
p
port --v
e
rify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
M
a
rtin von Zweigbergk
Documentati
o
n/git-pull: c
l
arify c
o
nfiguration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbe
r
gk
re
b
ase
-
X: do not clobber st
r
ategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree