repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Sync with 1.7.12.2
2012-09-18
Martin von
Z
w
eigber
g
k
rebase u
s
age
:
subcommands can not be
c
ombined with -
i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n von Zweigb
e
rgk
cherry-
p
i
ck/revert: respect order of revisions
t
o
pi
c
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
artin von Zwei
g
ber
g
k
demonstrat
e
broke
n
'git cherry
-
pick thr
e
e one two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mar
t
in von Zw
e
igbergk
te
a
ch log -
-
no-w
a
l
k
=unsorte
d
, whic
h
avoids sorti
n
g
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin
v
o
n
Z
weigbergk
ad
d
tests f
o
r 'git re
b
ase --keep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von
Z
weigbergk
cherry: remove redundant chec
k
for
merge
commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin v
o
n Zweig
b
ergk
che
r
ry: don't set ignor
e
d rev_in
f
o options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Ma
r
tin von Zweigb
e
rgk
remove unnec
e
s
s
a
ry parameter
f
rom get_
p
atc
h
_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
a
rtin von Zwe
i
gbergk
a
d
d test case f
o
r
r
ebase of empty c
o
mmit
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zweigbergk
am: don't cal
l
mailinfo if $
r
ebasing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am --rebasi
n
g: get
patc
h
body from
c
o
m
mit,
n
ot from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zwei
g
bergk
rebase --ro
o
t: print usage on too
m
a
ny arg
s
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
in von Zwei
g
be
r
g
k
rebase: don't sou
r
ce g
i
t-sh-setup t
w
ice
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zwe
i
gbe
r
gk
t3401: use test_com
m
it in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Zw
e
i
g
be
r
gk
t
3
401:
m
odernize
style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zweigber
g
k
am: d
o
n't persist keepcr
flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
i
n
v
o
n Zweigbergk
remote: only upd
a
te remo
t
e
-tracking branch if updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin vo
n
Zw
e
igber
g
k
remote re
n
ame: wa
r
n whe
n
r
e
fspec
w
as n
o
t updat
e
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remo
t
e: "rename o f
o
o" sh
o
u
ld
not
r
e
n
a
m
e
re
f
"origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n von Zweigberg
k
r
emote: write co
r
r
e
ct fetch
s
pe
c
when renaming remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zwe
i
gbergk
gitk: Sho
w
modifi
e
d files w
i
th separa
t
e
work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Zweigbergk
gitk: Simplify calculation
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Zweigbergk
gitk: Run 'g
i
t rev-parse
-
-git-dir'
onl
y
once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zweigbergk
git
k
: Put temp
o
rary directory
i
nside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin v
o
n Zw
e
i
g
b
e
rgk
gitk:
F
ix "Exter
n
al diff" with sep
a
rate
w
ork tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Z
w
eigbe
r
gk
g
itk: Fix "blame p
a
r
ent
c
ommit" wi
t
h separ
a
te work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in v
o
n Zwei
g
bergk
gitk:
F
ix "sh
o
w origin of th
i
s
l
ine" w
i
t
h
separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zweigbergk
gi
t
k: Fix file h
i
ghlight wh
e
n run
i
n subdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
von
Z
weigb
e
r
g
k
r
e
base: clarify "resto
r
e
t
he origin
a
l branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von Zwei
g
bergk
Documentation: use [verse] for SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
art
i
n v
o
n Zwei
g
b
e
rgk
diffcore-rename:
don't consi
d
er unmerge
d
p
a
t
h as so
u
rce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zweig
b
ergk
re
b
ase:
d
efine options in
OPTIO
N
S_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
tin v
o
n Zwei
g
bergk
Makef
i
le:
d
o not in
s
t
a
l
l sourced rebase
s
cripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Z
w
eigbergk
mer
g
etool
:
don'
t
skip modify
/
remove
conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin
von Zweigb
e
rgk
r
e
rere "remainin
g
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
rgk
r
ebase: use @{
u
pstream} if no u
p
stream specifie
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
t
i
n von Z
w
eigbergk
r
ebase -i: remove unnec
e
ssary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
e
igbergk
r
ebase -i: d
o
n
't read unuse
d
va
r
iable preserve_merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
g
i
t
-rebas
e
--am: rem
o
ve unn
e
ces
s
a
ry
-
-3way o
p
tion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase -m: d
o
n't pri
n
t
exit code 2 when merg
e
fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zw
e
igbergk
rebase
-
m: remember allow_r
e
rere_autoupd
a
te option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zw
e
igbe
r
gk
rebase: reme
m
ber strategy a
n
d strategy
options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von Z
w
e
i
g
bergk
rebase: remember verbose
o
pti
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
gb
e
rgk
reb
a
se: ex
t
ract cod
e
for writing
b
a
sic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n v
o
n Zweigbergk
rebas
e
:
factor out
sub command handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
rebase: make -v a tiny bit more verbose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin v
o
n Zweigbergk
rebase -i: a
l
ign va
r
iable name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on Zweigbergk
r
e
b
a
s
e: s
h
ow consistent conflict re
s
olution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
e
x
t
r
act
a
m code to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: e
x
t
ract mer
g
e
c
ode
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
Mar
t
in von Zweig
b
e
r
gk
rebase: remo
v
e $branch as synonym for
$orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
rebase: factor out refe
r
ence parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
von Zwei
g
bergk
rebase -i:
s
upport --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
re
b
ase: re
o
rder validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zw
e
ig
b
ergk
rebase:
factor out call to pr
e
-reb
a
se hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
ergk
r
e
b
as
e
-i: r
e
move now unnec
e
ss
a
r
y
directory
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
weigbergk
rebase:
factor out
clean
work tr
e
e
c
h
eck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin v
o
n Zweigbergk
rebase
:
factor
o
ut command line option process
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n vo
n
Zweigbergk
rebase: align variable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
rebase: alig
n
v
a
riable n
a
mes
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
ei
g
bergk
rebase
:
stricter
check
of stan
d
alone
s
ub comma
n
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zweigbergk
reb
a
se: act o
n
command
line outside
parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigberg
k
reba
s
e: impr
o
ve
d
e
t
ection of
r
ebase
i
n progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
r
emove
u
n
u
sed reba
s
e
state 'prev
_
h
e
ad'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on Zweig
b
ergk
rebase: r
e
ad st
a
te o
u
tside
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
von
Zweigbergk
r
eb
a
s
e
: refactor reading of stat
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igberg
k
rebase: clea
r
er names for di
r
ectory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Ma
r
tin von Z
w
eigber
g
k
completion: ad
d
missing conf
i
gura
t
ion variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
von Zweigberg
k
Use
r
e
f
log
i
n
'
pull
--rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rtin vo
n
Z
weigbergk
rebase:
o
nly
sh
o
w stat if
c
onfi
g
ured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von Zweigbergk
reba
s
e --abort
:
do not update branch
r
e
f
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mart
i
n von Z
w
e
i
gbergk
re
b
as
e
: s
u
p
port --v
e
rify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zwe
i
gber
g
k
D
o
cumentation/git-pull: clarify
c
onfiguration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin
von Zwe
i
gbe
r
gk
rebas
e
-X: do n
o
t
clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree