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
gitignore: make pattern parsing code a separate function
2012-08-09
Martin von Zweigbergk
a
dd tests for 'git rebase --keep
-
empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mar
t
i
n
von
Z
weigbergk
add
t
est case for rebase
o
f empty commit
commit
|
commitdiff
|
tree
2011-12-12
M
a
r
tin von Zweigbergk
t3401: use test_commit in
s
etup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
M
a
r
tin
v
on
Z
we
i
gbergk
t3401: m
o
dernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Martin von Zwei
g
bergk
am: don't per
s
ist ke
e
p
c
r flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zw
e
igbergk
remote: only
u
pda
t
e remote-tracking branch i
f
updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
art
i
n
von Zweigbergk
remote rename: warn when refspec
w
a
s
no
t
up
d
ated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von Zweigbergk
remote: "rename o foo" should not
r
ename
ref
"o
r
igin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
tin von
Zwe
i
gbergk
re
m
ote:
w
rite corr
e
ct fe
t
ch spec when renami
n
g remote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin vo
n
Zweigb
e
r
g
k
gitk: Show modif
i
ed file
s
with separate w
o
rk 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
M
a
rtin von Zweig
b
ergk
gitk: R
u
n 'git
r
e
v
-parse --git
-
dir' only onc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweig
b
ergk
gitk: Put
temporar
y
d
irectory inside
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zw
e
igbergk
gitk:
Fix "Ex
t
ernal
d
iff"
with
s
e
p
a
rate work tre
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin von Zwe
i
gber
g
k
gitk: Fix "blam
e
parent
c
ommit" wi
t
h separate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
i
n von Zw
e
igbergk
gitk: Fix "show origi
n
o
f this line" wit
h
se
p
a
r
ate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zweig
b
ergk
gitk: Fix
file hi
g
h
lig
h
t when run in
s
ubdirectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
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 von
Z
weigbergk
D
ocumentat
i
on: us
e
[
v
erse] f
o
r SYNOPSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
M
artin von Zweig
b
er
g
k
diffcore-rename: don't consid
e
r un
m
erged path
as
s
ource
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zwei
g
bergk
r
e
base: d
e
fine options
i
n OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
t
i
n von
Zweigbe
r
g
k
Makefile:
d
o not
i
nstall sourced reba
s
e sc
r
ipts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Zwei
g
b
e
rg
k
mergetool: don't skip
modify/remove
c
o
n
flicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zwe
i
gbergk
r
e
r
ere "remaining
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Zweigbergk
rebase
:
u
s
e @{upstream} if no
upstream specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbergk
r
e
b
ase
-
i: remove unn
e
cessary state re
b
ase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
-i:
d
on't read unused variable preserve
_
merges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
g
it-reba
s
e--
a
m: rem
o
ve u
n
necessa
r
y --3
w
ay option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbe
r
gk
rebase -m: don't pr
i
n
t
exit c
o
de
2
when merge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwe
i
gbergk
rebase -m: rememb
e
r
allow_rerere_a
u
to
u
pdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
von Zwe
i
gber
g
k
rebas
e
:
reme
m
ber strategy and
s
t
rategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: r
e
member verbos
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
i
n
v
o
n
Zweigbe
r
gk
reba
s
e
: extract code
f
or writing
b
asic s
t
at
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rt
i
n von Z
w
eigber
g
k
rebase
:
factor out su
b
command
h
and
l
in
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
vo
n
Zw
e
igbergk
reba
s
e: make -
v
a tiny
b
it m
o
re ve
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
rebase -i: align variabl
e
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
tin von Zweigberg
k
reba
s
e:
show c
o
nsiste
n
t conflict resolut
i
on
h
i
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Z
w
eigbergk
reb
a
s
e
:
extract am
code to new so
u
rce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
on
Z
weigbe
r
gk
r
ebase: extr
a
ct merge code t
o
ne
w
s
o
u
rce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweig
b
erg
k
reba
s
e: remove $bran
c
h as
synon
y
m f
o
r
$orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
g
b
er
g
k
rebase: factor out refer
e
nce parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Zweigbergk
re
b
a
se
-
i: support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigber
g
k
rebase: reorder val
i
dation
s
t
e
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: facto
r
out cal
l
to pre-r
e
base hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
r
ebase -i: remove now unnec
e
ssary directory
checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e: factor
o
u
t
clean work tre
e
ch
e
ck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigber
g
k
rebase: factor out command li
n
e o
p
tion pro
c
essing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
rebase
:
align variable
content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n von Zweigber
g
k
rebase: align variable names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Z
w
eigber
g
k
r
ebase: s
t
ricter
check of stan
d
alo
n
e sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
rebase: a
c
t on command line outsi
d
e
parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
:
improve detecti
o
n of rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in
von Zw
e
i
g
ber
g
k
reba
s
e: remo
v
e
u
nused reb
a
s
e
state 'pre
v
_
h
ead'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigbergk
rebase: read
state out
s
i
de lo
o
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n Z
w
e
i
gbergk
rebase:
r
efact
o
r reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Zwe
i
gbergk
rebase
:
clearer names for directory
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin
von Zw
e
igb
e
rgk
c
o
mple
t
i
on: add
missing configurat
i
on variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von Zweigber
g
k
Use
r
eflog
i
n
'pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
rtin von Zweigber
g
k
rebase: only show
s
t
a
t
i
f
c
onfigured t
o
true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin
v
on Zwei
g
be
r
gk
rebase --abo
r
t: do not update b
r
anch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin v
o
n Zweigbergk
rebase: su
p
por
t
--ve
r
ify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin
von Zweigbergk
Documentation/g
i
t-pull: cl
a
r
i
fy configuration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweigbergk
rebase -X: do not cl
o
bber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree