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
Merge branch 'jk/config-warn-on-inaccessible-paths' into maint
2012-08-30
Martin
v
on
Zweigbe
r
gk
ch
e
rry-pi
c
k/reve
r
t: respect
ord
e
r of revision
s
to p
i
ck
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
dem
o
nstrate br
o
ken 'git cherry-pick
t
hree one
tw
o
'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigb
e
rgk
teach log --n
o
-walk=
u
nsorted, which avoids
s
orting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Ma
r
ti
n
von Zweigb
e
rgk
add tests
f
or
'gi
t
rebase
-
-keep-
e
mpt
y
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin von Z
w
eigbergk
a
d
d
t
e
st case
f
or rebase of emp
t
y commit
commit
|
commitdiff
|
tree
2012-06-26
Martin v
o
n Zweigber
g
k
am: don't call maili
n
f
o
i
f
$re
b
asing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin vo
n
Zw
e
igbergk
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 von
Z
w
eigb
e
rgk
rebase
--
r
oot
:
prin
t
usage on too many args
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von
Z
w
eigbe
r
gk
rebase:
don't
source g
i
t
-
sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zweig
b
ergk
t3401: use te
s
t_commit in set
u
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin
vo
n
Zw
e
igbergk
t
3
401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mar
t
in v
o
n Z
w
eigbergk
am: don't per
s
ist keepcr fl
a
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mar
t
in von Zweigbergk
remote: only up
d
ate
r
em
o
te-tracki
n
g
branch if upda
t
i
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Zweigbergk
remote rename: w
a
rn when refspec
w
as not
u
pdated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
i
n
v
on
Zwe
i
gb
e
rgk
remote: "re
n
ame o foo" sh
o
uld not r
e
name
r
ef "orig
i
n
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigb
e
r
g
k
remo
t
e: write co
r
rect
f
etch
sp
e
c when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
i
n v
o
n Zweigbergk
gitk: Sh
o
w
m
odified files with se
p
arate work t
r
ee
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigb
e
rgk
g
itk:
S
implif
y
calcu
l
ation
of
g
itdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zweigbergk
gitk: Run 'git rev-parse --
g
i
t
-dir
'
only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin vo
n
Z
w
eigbergk
gitk
:
Put
t
e
m
p
or
a
ry director
y
inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk
:
Fix "
E
x
t
ernal dif
f
"
w
ith sep
a
r
ate wo
r
k tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zwe
i
gbe
r
g
k
g
i
tk:
F
ix "b
l
a
m
e
parent co
m
mit" with separate wor
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Z
w
eigbergk
gitk
:
Fix "s
h
ow origin
o
f t
h
is 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:
F
ix fi
l
e
highlig
h
t when run i
n
s
ub
d
ir
e
ctory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin von Zw
e
i
gb
e
rgk
rebase: clarify "re
s
tore t
h
e original branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Mar
t
in von Zweigbergk
D
o
cumentation: us
e
[verse] fo
r
SYN
O
PSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mar
t
in von Zweigb
e
r
gk
diffcore-renam
e
:
don't c
o
n
s
ider unmerged path as s
o
urce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
von Z
w
eigbergk
reb
a
s
e
: define option
s
in OPTIONS_
S
PEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zwei
g
b
e
rgk
Makefile: do not insta
l
l sou
r
ced rebase scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Z
weigbergk
mergetool: don't
s
kip modify/rem
o
ve
c
onf
l
icts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
artin von Zweigbe
r
g
k
rerere
"remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zwei
g
bergk
rebase:
use @{upstream} if n
o
ups
t
ream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
igbergk
reba
s
e
-i: remov
e
unnecessar
y
state
r
e
b
ase-roo
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zw
e
igbergk
rebase -i: do
n
't read unused variable preserve_mer
g
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
git-rebase--
a
m
: remove unnec
e
ssar
y
-
-
3
way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase -
m
:
don't print exit code 2 when merge fail
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
re
b
ase -m: reme
m
ber allow_rer
e
re_au
t
ou
p
date opti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von Zw
e
ig
b
ergk
reb
a
s
e
: rem
e
m
b
er
s
trategy
and strategy option
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
r
gk
reba
s
e
:
remember verbo
s
e option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
eigbe
r
gk
r
e
base: extract co
d
e
f
or writin
g
basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
v
o
n
Zweigbergk
r
eb
a
se: factor
out sub command
h
an
d
ling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase: make -v a ti
n
y bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Z
w
eigber
g
k
rebase
-i
:
align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbe
r
gk
reb
a
se: show consistent conflict resolut
i
o
n hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: extract am code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
e
i
gbergk
reb
a
se: extract mer
g
e
code
t
o new s
o
urce fi
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von
Z
w
eigber
g
k
rebas
e
: rem
o
ve $branc
h
as synonym f
o
r $orig_hea
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbergk
rebase: factor out re
f
erence parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
e
i
g
b
erg
k
rebase -i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zweigbergk
rebase: reorde
r
va
l
i
datio
n
ste
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: factor out cal
l
to p
r
e-rebase ho
o
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zwei
g
bergk
re
b
ase -i: remove now
unnece
s
sary d
i
r
ectory check
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: factor out
c
lean work tr
e
e
c
he
c
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Z
w
eig
b
e
r
gk
rebase: factor out c
o
mmand
l
ine option
p
roc
e
s
s
i
n
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigberg
k
rebase: align v
a
riable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
rebase: align variable na
m
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: strict
e
r check of
s
ta
n
da
l
one sub
c
omma
n
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Zwei
g
bergk
r
eb
a
s
e: act on comma
n
d line outside parsing
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
reba
s
e
: improve detection
of
r
e
ba
s
e in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gberg
k
reb
a
se: remo
v
e
unused rebase state 'p
r
ev_hea
d
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin
von Zweigbergk
rebase
:
r
ead state outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
ei
g
bergk
re
b
ase: refactor reading of s
t
at
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n
v
on Zweig
b
ergk
rebase: clear
e
r names fo
r
direc
t
ory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbe
r
gk
c
o
mpletio
n
: add missin
g
configuration v
a
riables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin vo
n
Zweigberg
k
Use
r
eflog in 'p
u
ll -
-
rebas
e
.
fo
o
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigbergk
rebase: only show stat if conf
i
gured to
t
rue
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
a
rtin von
Zweigbergk
r
e
ba
s
e
--abort:
do n
o
t up
d
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
bergk
rebase: suppor
t
--verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von
Z
weigbergk
Docu
m
entation/git-pull: cla
r
ify configuratio
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
M
artin von Zwei
g
berg
k
rebase
-
X
: do
n
ot clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree