repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
format-patch: pick up branch description when no ref is specified
2012-08-30
Martin
v
o
n
Zweigbergk
cherry-p
i
ck
/
revert: re
s
pect ord
e
r
of
r
evision
s
to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
demonstrate broken
'
g
it cherry-pick three
o
n
e two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zwei
g
ber
g
k
teach log --no-walk=unsorted, which
avoi
d
s sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin
von Zweigbergk
add tests for 'git rebase
-
-keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mart
i
n von Zweigbergk
add
t
e
st
case for reba
s
e o
f
empty com
m
it
commit
|
commitdiff
|
tree
2012-06-26
M
a
rti
n
von Zweigbergk
am: don'
t
call maili
n
f
o
if $rebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Zweigbergk
am
--r
e
bas
i
n
g:
g
e
t
patch b
o
dy fro
m
commit, not f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von Zweigbergk
rebase --
r
oot: prin
t
u
sage on too m
a
ny arg
s
commit
|
commitdiff
|
tree
2012-06-26
Marti
n
von Z
w
eigbergk
r
eba
s
e: don
'
t source git-sh
-
setup twic
e
commit
|
commitdiff
|
tree
2011-12-12
Martin
v
on Zw
e
ig
b
e
r
gk
t3
4
01: use test_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Z
w
eigbergk
t
3
4
01
:
moder
n
ize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Z
w
e
igbergk
a
m: do
n
'
t
p
ersist k
e
epcr
f
la
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Z
w
e
ig
b
ergk
re
m
ote: only update
remote-t
r
ac
k
ing branch if upda
t
ing
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remote renam
e
: warn
w
hen refspe
c
was not
updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on
Zweigbergk
remote
:
"rename o
foo"
s
hould not
r
en
a
me ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin
v
on Zweigbergk
rem
o
t
e
: write cor
r
ect fe
t
ch spec when
renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Show modified files
with sep
a
rate work
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
git
k
:
S
implify calc
u
lation
o
f
g
i
tdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Z
weigbergk
g
i
tk: Run 'git r
e
v-par
s
e --git-dir' onl
y
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
i
n von Zweig
b
ergk
gi
t
k: Put tempor
a
r
y directory insid
e
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in
von Zweigber
g
k
g
it
k
:
Fix "Ext
e
rna
l
d
if
f
" with sep
a
rate
w
ork
tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweigbergk
gitk:
Fix "blame parent commit" with separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zwe
i
gbergk
gitk: Fix "sho
w
origin
o
f
this line" with sep
a
r
a
te
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigber
g
k
gitk: Fix fil
e
highlight when
r
un in
subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Mart
i
n vo
n
Zweigbergk
r
e
base:
cla
r
ify "restore the origin
a
l
b
ra
n
ch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
artin v
o
n
Zweigberg
k
Documentation
:
use [verse] for SYN
O
PSIS s
e
ctio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin v
o
n Zweigbergk
diff
c
ore-r
e
n
ame: don't consider
unme
r
g
e
d pa
t
h
as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von
Z
w
e
ig
b
ergk
rebase: define optio
n
s in OPT
I
ONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zweigbe
r
gk
Ma
k
e
file:
d
o not in
s
tall sourc
e
d rebase
s
cripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zweigbergk
m
ergetool: don't skip modify/re
m
o
ve con
f
lict
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zwei
g
bergk
r
e
r
ere "rema
i
ning
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebas
e
: u
s
e @{
u
pst
r
e
a
m}
i
f no
upstream sp
e
cified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
b
ase
-
i
: remove unnecessar
y
s
t
at
e
reb
a
se-roo
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
w
eigbergk
rebase -i: don't rea
d
unus
e
d variabl
e
p
r
eser
v
e_me
r
ges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in
v
on Zwe
i
g
bergk
g
i
t-rebase--am:
r
emov
e
u
nnecessar
y
--3way o
p
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m:
d
on't print e
x
it code 2 wh
e
n merge
f
a
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zweigber
g
k
rebase -m:
r
emember allow_re
r
ere
_
au
t
o
u
pdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweig
b
e
rgk
re
b
ase: r
e
member strategy and strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: rem
e
mber verbose option
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 code f
o
r
writing bas
i
c
state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: factor
o
ut sub comm
a
nd handl
i
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
r
e
bas
e
: make -v
a
tiny bit more
v
erbo
s
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
reb
a
se
-i: al
i
gn vari
a
bl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zwei
g
b
ergk
rebase: show con
s
ist
e
nt conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwe
i
gb
e
rgk
r
e
base: extract am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Z
we
i
gberg
k
rebase: extract merg
e
code to new
s
ou
r
ce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: remove
$
bra
n
ch as synonym f
o
r $orig_
h
ead
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
v
on Zweig
b
ergk
rebase: factor out referenc
e
p
arsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gb
e
rgk
rebase
-
i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Zweigbergk
r
ebase:
reord
e
r validatio
n
steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
factor out call to pre-rebase h
o
ok
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zw
e
igbergk
rebase -i: re
m
ove now
unnecessar
y
directory
c
h
ecks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweigbergk
rebase: fact
o
r o
u
t
clean work
t
ree
c
heck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase
:
factor out com
m
and
li
n
e option processing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von Zweigbergk
r
e
base
:
align varia
b
le co
n
tent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbergk
rebas
e
:
align variable
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
re
b
ase: stricter check of
standalone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbergk
r
ebase
:
a
c
t on comman
d
l
i
ne
o
utsi
d
e p
a
r
sing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Zwe
i
g
bergk
r
ebase:
i
mprove de
t
ection of rebase in pr
o
gress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
rebase:
re
m
ov
e
unused rebase state 'prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbergk
rebas
e
:
r
ead state
outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Z
w
eigberg
k
re
b
ase: refact
o
r readin
g
of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Zweigb
e
rgk
r
ebase: c
l
earer n
a
mes fo
r
d
ire
c
t
ory v
a
r
i
a
bl
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
tin von Zweigbergk
comp
l
etion:
ad
d
missing c
o
nfiguration var
i
ables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Mart
i
n von
Zweig
b
ergk
Use reflog
in 'pull --
r
ebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
rebase: only sh
o
w stat if co
n
figured
to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbergk
reba
s
e
-
-abo
r
t: do
n
ot update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
M
artin
v
on Z
w
eigbergk
rebase:
suppor
t
--verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in von Zw
e
ig
b
ergk
D
o
cumentation/git-pull: clarify c
o
nfiguration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Ma
r
ti
n
von
Z
weigbergk
rebas
e
-X: do not clobb
e
r strat
e
gy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree