repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rr/git-uri-doc'
2012-09-18
M
artin vo
n
Zwe
i
gbe
r
gk
reb
a
se usage: sub
c
ommands can not
be combined with -i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin von Zweigbergk
cherr
y
-
pick/r
e
vert
:
resp
e
ct order of revisions to pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Ma
r
tin von
Zwei
g
bergk
demonstrate
b
r
o
ken '
g
it c
h
erry-pick
t
h
r
e
e
on
e
two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Z
w
eigberg
k
t
each log --
n
o-walk
=
un
s
orted, which avoi
d
s sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
M
a
rtin von Zweigbergk
ad
d
test
s
for 'g
i
t rebase --k
e
e
p-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin von
Zwe
i
gbe
r
gk
cherry: remove redundant check for merge commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
M
artin von Zwe
i
gbergk
cherry
:
don't set ignored rev
_
info o
p
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Martin von Zw
e
igbergk
r
emove unnecessary pa
r
ame
t
er from g
e
t
_
pat
c
h_ids()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Mar
t
in von Zw
e
igbergk
a
d
d test case fo
r
r
e
ba
s
e of
empty
c
ommit
commit
|
commitdiff
|
tree
2012-06-26
Marti
n
von Zweigbergk
a
m
: do
n
't call mai
l
i
n
fo if $rebas
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin von Zweigbergk
am
--r
e
basin
g
:
g
et patch body
f
rom com
m
it, not f
r
o
m
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
a
rtin von
Z
weigbe
r
gk
rebase --
r
oot: pr
i
n
t usage
on too many
a
r
g
s
commit
|
commitdiff
|
tree
2012-06-26
Martin
v
on Zweigb
e
rgk
r
e
base: don
'
t sour
c
e git-sh-setup twice
commit
|
commitdiff
|
tree
2011-12-12
Martin vo
n
Zw
e
igber
g
k
t3401:
u
se t
e
st_commit in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n von Zwe
i
gb
e
rgk
t3401: modernize style
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
M
a
rtin von Z
w
eigbe
r
gk
am: don't persist keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
rem
o
te:
on
l
y
update
r
emote
-
tracki
n
g branc
h
if up
d
ati
n
g
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zweigb
e
r
g
k
remote
rename
:
wa
r
n when refspec was not u
p
dated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
re
m
ote: "rename o
f
oo" should
n
o
t ren
a
me ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zwei
g
be
r
gk
re
m
ote: write correct fetch spec when renaming
r
emote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Show modified files with
se
p
a
ra
t
e work
tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin
von Zweigbergk
gitk: Simp
l
ify c
a
lculation of
gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n
v
o
n
Zweigb
e
rgk
gitk: Run 'git rev-
p
arse --git-d
i
r' only
o
nce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Z
weigbergk
git
k
:
P
u
t temporary direct
o
ry inside
.
g
i
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Z
w
eigbergk
gitk: Fix "External
d
iff" wi
t
h sepa
r
ate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweig
b
ergk
gitk: Fix "bl
a
me
par
e
nt
c
o
mmi
t
" w
i
t
h
separ
a
te work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gitk: Fix "show origin of th
i
s l
i
ne" with separate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Z
wei
g
bergk
gitk: Fix
f
ile highl
i
ght when
r
un in subdirect
o
ry
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Marti
n
von Zweigbergk
rebase: clarify "rest
o
re the or
i
ginal branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
a
r
tin
von
Zweigbergk
Do
c
um
e
nta
t
ion:
u
se [verse] for SY
N
O
PSIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin vo
n
Zweig
b
e
r
gk
diffcore
-
r
e
nam
e
: don't consider unme
r
ged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin
vo
n
Zweigbe
r
gk
rebase
:
d
efine opti
o
ns in O
P
TIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Ma
r
t
in vo
n
Zweigbergk
Makefile: do
not in
s
tall
s
o
urced re
b
ase s
c
rip
t
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Ma
r
tin von
Z
weigb
e
rgk
merget
o
ol: don't ski
p
mo
d
if
y
/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweig
b
e
rgk
r
erere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwei
g
b
e
rg
k
reb
a
se: use @{upstream} if no upstre
a
m
s
pe
c
if
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zwei
g
b
e
rgk
rebas
e
-i: r
e
m
o
v
e
unnec
e
ssa
r
y state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase
-
i: do
n
't read unused var
i
able
preserve_merg
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von
Z
weigbergk
git-rebase--am: remov
e
unnecessary --3w
a
y
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigberg
k
rebase
-m: don't p
r
int e
x
it code 2 when m
e
rge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -m: remember allow
_
rerere_autoupdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von
Z
weigbe
r
gk
rebase
:
rememb
e
r st
r
ategy and
s
tr
a
t
e
gy opt
i
ons
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
gk
rebase: remember verb
o
se
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Zweigbergk
r
ebase:
e
xtract code for writing bas
i
c state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
re
b
ase:
f
act
o
r out
s
u
b comman
d
handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigber
g
k
rebase:
m
ake
-v a ti
n
y bit more ve
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase -i: ali
g
n var
i
able
n
ames
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on
Z
weigbergk
re
b
ase:
show consistent conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
extract
am co
d
e
to new source file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
reba
s
e
:
e
xtra
c
t merg
e
code t
o
new s
o
urce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Z
w
eigber
g
k
r
e
ba
s
e: remove $bra
n
ch as syn
o
nym for $orig_head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
i
n
v
on
Z
weigber
g
k
r
ebase: factor
out reference
p
arsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
reba
s
e -i: su
p
por
t
--
s
tat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
v
o
n
Zweig
b
ergk
reb
a
s
e: reor
d
e
r va
l
idation st
e
p
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigbergk
reb
a
se:
factor
o
u
t
call to pre-rebas
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n
Zwei
g
bergk
rebase -
i
: r
e
move
n
ow
unnecessary directory checks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
e
base: factor
o
ut clean work t
r
e
e ch
e
c
k
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase: fac
t
or out co
m
mand line
option processin
g
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gb
e
r
g
k
rebas
e
:
align var
i
a
b
le content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
arti
n
v
on Zw
e
igb
e
rgk
rebase:
alig
n
variable
n
a
m
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von Zweigber
g
k
rebase: stricter check of s
t
and
a
lone sub command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
rebas
e
: act on command
l
ine outsi
d
e parsing
l
o
op
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Z
weigbe
r
gk
rebase:
impr
o
v
e
detection o
f
rebase in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin vo
n
Zweigberg
k
rebase:
r
em
o
ve unused rebase st
a
te 'p
r
ev_head
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigberg
k
reb
a
se: read state
o
utsi
d
e
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: r
e
fac
t
or reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase
:
clearer names
f
or
directory
v
ariables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von
Z
weigberg
k
c
o
m
p
l
e
tion
:
add
missing c
o
nfi
g
uratio
n
variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
von Zweigbergk
Use reflog in
'
pull --rebase
.
foo'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Marti
n
v
o
n Zw
e
igbergk
rebas
e
:
only show stat if conf
i
gured to tr
u
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Martin von
Z
weigbergk
r
ebase --a
b
ort: do not
u
p
d
a
te
b
r
a
nch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Mart
i
n von
Z
w
e
igbergk
reb
a
s
e:
support -
-
v
erify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Mar
t
in von
Z
weigbergk
Docu
m
entation/git-
p
ull: c
l
arify conf
i
guration
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin von
Z
w
eigberg
k
rebase -X: do not
clobber
s
trategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree