repo.or.cz
/
git
/
git-svn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Git 1.8.1.4
2012-12-23
Ma
r
tin
vo
n
Zw
e
igbergk
l
ear
n
to
pick/rev
e
rt into unborn branch
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-12-23
M
a
rtin von
Z
w
eigbergk
tests: move test_cmp_r
e
v
to
test-
l
i
b-fun
c
ti
o
n
s
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Marti
n
v
o
n
Z
weigbergk
rebase usage: subc
o
mmands can
not b
e
combi
n
ed with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
cherry-
p
ick/revert: respect order
of revisions t
o
pic
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
r
t
i
n vo
n
Zweig
b
e
r
gk
demonstrate
b
rok
e
n
'g
i
t cherry-pick three one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
i
n
von Zweigbergk
teach log --no-walk=unsorted, which avoids
s
orting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Marti
n
von Zw
e
igbergk
add t
e
s
t
s f
o
r 'git
re
b
as
e
--
k
eep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
v
on Zweigbe
r
gk
cherry
:
r
emo
v
e re
d
undant check
for merge commi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Mart
i
n von Zwei
g
b
e
rgk
c
herry: don't
set ig
n
ored rev_inf
o
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
M
a
rti
n
von Zweigbergk
remov
e
un
n
ecessary p
a
r
ameter fro
m
g
e
t_patch_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mar
t
in von
Zweigbergk
a
d
d
t
e
st
case fo
r
r
e
b
a
se
of empty commit
commit
|
commitdiff
|
tree
2012-06-26
Marti
n
v
on Zwei
g
b
ergk
am
:
don't call
m
ailinfo
i
f $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zweigb
e
rgk
am --rebasing
:
get patch body from commit, not from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n Zweig
b
ergk
rebase --root: print usage on
too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin von Z
w
eigberg
k
reb
a
se: don't source git-sh-setup t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweigberg
k
t34
0
1: us
e
test_commit in se
t
up
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
on Zweigbergk
t3401: moderniz
e
s
tyle
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweig
b
ergk
am: don
'
t per
s
ist kee
p
cr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
we
i
g
b
e
rgk
r
emote: only update remote-trac
k
ing
b
ranc
h
if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwe
i
gbergk
re
m
ote rename: warn
when ref
s
pec
was no
t
up
d
at
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin
v
o
n
Zweigbergk
remote: "r
e
nam
e
o
foo"
should not rename ref
"
origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
a
rtin von Zweig
b
ergk
r
emo
t
e:
writ
e
co
r
rect
f
etch
s
pec wh
e
n renaming remot
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Show modified
f
i
les
with
s
eparat
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in von Z
w
ei
g
ber
g
k
gi
t
k:
Simplify c
a
l
c
ula
t
ion of
g
itdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in
v
on Zweigbergk
g
itk: Ru
n
'
g
it rev-parse --git
-
di
r
' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigber
g
k
g
i
tk: Put t
e
mp
o
rar
y
direc
t
or
y
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
in
v
o
n Zweigbergk
gitk: Fix
"
External d
i
f
f" with separat
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: F
i
x
"blame parent commit"
with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zw
e
igbergk
gitk: Fix
"show origin
o
f this line
"
with
s
epar
a
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
i
n von Zweig
b
ergk
gi
t
k: Fi
x
fil
e
highlig
h
t when run in su
b
directory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Mar
t
in von
Zweigbergk
rebase
:
clarify "restore
the original b
r
a
n
ch
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zweigberg
k
Do
c
ume
n
tation: use [verse
]
for
S
Y
NOPS
I
S sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mart
i
n
v
on
Zweigbe
r
gk
diffcore-rename: don't con
s
ider
u
nmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweigbe
r
gk
rebase: de
f
ine o
p
t
ions in
O
PTION
S
_SPE
C
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
M
a
r
t
in
v
o
n Zweigberg
k
M
a
kefile: do not in
s
tall s
o
urced rebas
e
s
cript
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
arti
n
von Zweigb
e
rgk
m
ergetool: don'
t
skip mod
i
fy/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin v
o
n Zweigb
e
rgk
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: u
s
e @{up
s
tream} if
no
u
pstream specif
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
r
e
ba
s
e
-i: rem
o
ve unnece
s
sary
s
tate r
e
base-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbe
r
gk
rebase -i:
d
on't read u
n
used variable
p
res
e
rv
e
_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zwe
i
gber
g
k
git
-
reba
s
e
-
-
a
m: r
e
m
o
ve unn
e
c
essa
r
y
--3
w
a
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbe
r
gk
reba
s
e
-
m: don't print ex
i
t code
2 when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweigbergk
r
e
base -m: remember allow_re
r
ere_autoup
d
ate
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
weigbergk
rebase: remem
b
er s
t
rategy a
n
d strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reba
s
e: remember verbose option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von Zweigbergk
rebase: extrac
t
c
ode for writi
n
g basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigb
e
rgk
reb
a
se: factor out sub
command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von
Zweigb
e
r
g
k
rebase: make -v
a
tiny bit
m
ore
v
e
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
e
base
-
i
:
a
l
ign vari
a
ble nam
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: show con
s
istent c
o
nf
l
ic
t
resoluti
o
n
h
i
nt
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: extract
am code
to new
s
ource file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von Zweigbergk
rebas
e
:
e
x
tract
mer
g
e
code to new
source
file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: remo
v
e $bra
n
ch as synon
y
m fo
r
$orig
_
head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
in von Zweigbergk
r
e
base: fact
o
r ou
t
ref
e
rence parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
r
gk
reb
a
se -
i
: su
p
port --
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zwe
i
gbergk
r
e
base: r
e
order validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbe
r
g
k
rebase:
factor out cal
l
to pre-rebas
e
h
o
ok
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase -
i
:
r
e
move no
w
u
n
necessary directory
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebas
e
: factor out
clean w
o
rk t
r
ee check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
r
ebase: factor
ou
t
comman
d
line
o
p
tion proce
s
sing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigbergk
r
ebase: ali
g
n
variable
c
o
ntent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase: stricter check
of standa
l
one
s
u
b
command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
re
b
ase:
a
ct on com
m
a
n
d line
o
utside pa
r
sing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
e
igbe
r
gk
r
ebase: improve
d
etection of rebas
e
in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebas
e
: remove u
n
use
d
reb
a
s
e
stat
e
'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigberg
k
rebase: read stat
e
o
u
tsi
d
e
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
von
Zweigber
g
k
rebase: re
f
actor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
rebase: clearer name
s
for directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
tin vo
n
Z
w
e
i
gbergk
com
p
l
e
tion: add
missing co
n
f
i
guration vari
a
bles
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
U
se reflog in 'p
u
l
l --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Z
w
eig
b
ergk
rebase: only show stat if c
o
nfigured to
tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbe
r
g
k
r
e
base --
a
b
o
r
t: do not upd
a
t
e branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin von Zwei
g
b
e
r
gk
reba
s
e:
support --
v
er
i
fy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Ma
r
tin von Zweigbergk
D
ocumentation/git-pull: clarify con
f
i
g
u
ration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
a
rtin von Zweigbergk
rebase
-
X: do not
clob
b
e
r strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree