repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'ta/remove-stale-translated-tut'
2012-12-20
Martin
v
on Zweig
b
ergk
onew
a
y_mer
g
e(): o
n
ly lsta
t
() when told t
o
upd
a
t
e
worktree
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-09-18
Martin von Zwe
i
g
b
ergk
rebase usage: subcommands can not be
combined with
-i
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von
Zweigberg
k
cherry-pick/revert: respect
o
rder of revisio
n
s to pic
k
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Mart
i
n von Zweigbergk
demons
t
rate broken 'git cherry-pick three one t
w
o'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Zweigbergk
teach
l
og --no-walk=unsorted, w
h
ich avoids so
r
ting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin von Zw
e
igbergk
add
te
s
ts for
'git rebase --kee
p
-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin
v
o
n
Zweigberg
k
cherry: remove
r
edun
d
ant che
c
k for merg
e
commit
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-30
Martin von Zwe
i
gbergk
cherry: do
n
't set ign
o
re
d
rev_i
n
fo
o
p
tions
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-07-29
Ma
r
tin von Zweigbergk
remove unneces
s
ar
y
param
e
ter fro
m
get
_
pa
t
ch_
i
ds()
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
Martin vo
n
Zweigbergk
add test case for rebase of empty co
m
mit
commit
|
commitdiff
|
tree
2012-06-26
Mart
i
n v
o
n
Z
weigbergk
am: don't call mail
i
n
f
o if $reba
s
ing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Zwei
g
berg
k
am --r
e
basing: get patch body f
r
om commit, n
o
t
from
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Mar
t
i
n von Zweigb
e
rgk
r
ebase --root: prin
t
u
s
age on
t
o
o
m
any arg
s
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
tin von
Z
we
i
gbergk
r
eba
s
e: d
o
n't sou
r
ce git-sh-setu
p
tw
i
ce
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n
von Zweigbergk
t3
4
0
1
: use test_com
m
it in setup
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Ma
r
tin von Z
w
eigbergk
t
3
4
01
:
moderni
z
e sty
l
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Mar
t
in v
o
n Zw
e
igbergk
am:
d
on't
pe
r
s
ist keepcr
f
l
ag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Ma
r
t
i
n von Zwe
i
gbergk
remote: only update remot
e
-tracking bran
c
h i
f
updating
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Marti
n
von Zweigb
e
rgk
remote ren
a
me: warn when refspec
was no
t
updated
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remot
e
: "renam
e
o f
o
o" should not renam
e
ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
ar
t
in von
Z
wei
g
bergk
remote: write cor
r
e
ct
f
etc
h
spec w
h
en r
e
naming re
m
ote
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von Zweigbergk
gitk: Sho
w
modified fil
e
s with separa
t
e work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
tin von Zw
e
igbergk
g
itk: Simplify calculation
of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
v
on Zweigb
e
rgk
gitk:
Ru
n
'git rev-parse
--gi
t
-dir' only once
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von
Zweigbergk
gitk: P
u
t temporary directory inside
.
gi
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von Zwe
i
gbergk
git
k
: Fix "
E
xte
r
n
al di
f
f" w
i
th s
e
p
a
rate work tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Ma
r
t
in
vo
n
Zweigbergk
g
i
tk: Fix "blame parent
commit" wit
h
separate w
o
r
k
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in
von Zweigbergk
gitk: Fix "show origin of t
h
is line"
w
ith
separa
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von
Z
we
i
gbe
r
gk
gitk:
Fix file highlight when ru
n
in subd
i
rectory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Martin v
o
n
Zweigber
g
k
rebase: clarify "restore th
e
original bra
n
c
h
"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
Martin von
Z
weigb
e
rgk
Docume
n
tation: use [verse] f
o
r SYNO
P
SIS sections
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Martin von Zweig
b
e
r
gk
diffco
r
e
-rename: don't consider
unmerged
p
a
t
h as sourc
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Mart
i
n von Zweigbergk
rebase
:
def
i
ne options in OPTIONS_SPEC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Marti
n
von Zweigbergk
Makefile: do n
o
t
in
s
tall sourced
r
ebase sc
r
ipt
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigberg
k
mergetool: don't skip
mod
i
fy/rem
o
v
e
c
onflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von
Z
weigberg
k
rerere
"remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n
v
on Z
w
eigbergk
r
e
base:
u
se @{upstre
a
m} if no ups
t
r
eam s
p
ecif
i
ed
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigberg
k
rebase -i:
r
em
o
v
e
unnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebas
e
-i
:
d
o
n't read
unused
v
a
r
iable preserve_mer
g
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n
v
on Z
w
eigbe
r
g
k
git-rebase--am: r
e
move
unnece
s
sa
r
y
--3way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zw
e
igbergk
r
e
base -
m
: don't print exit co
d
e 2 whe
n
m
erge fa
i
ls
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
rebase -m:
r
emember a
l
low_rerere_autoupdate option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
re
b
ase:
r
emember strategy and strategy options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
r
ebase: remember ve
r
bose
o
ption
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin vo
n
Zweigber
g
k
r
e
b
ase: e
x
tr
a
ct code
f
or writi
n
g
b
a
sic
s
tate
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase: fac
t
or out su
b
comm
a
nd handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: make -v a
tin
y
bit more verb
o
se
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
von Zweigbergk
rebase -i: align variabl
e
name
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zwe
i
gberg
k
r
e
base: show consistent
conflict resolution hint
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Z
w
eigbergk
rebase: extract am code t
o
new so
u
rce f
i
le
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
ergk
rebase: extract
m
erge c
o
de to new source file
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
rebase: remove $
b
ranch a
s
synonym for $orig_he
a
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: factor out re
f
erence
p
ars
i
ng
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin von
Zweigbe
r
g
k
r
e
b
ase -i:
support --stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweig
b
ergk
r
ebase: reorder
validat
i
on steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwe
i
gbergk
rebase: fac
t
o
r
out c
a
l
l
to
p
r
e
-rebase
h
oo
k
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
: remove now unne
c
e
ssary
d
ire
c
tory chec
k
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
bergk
re
b
ase: facto
r
out clea
n
w
ork
t
ree check
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
v
o
n
Z
w
eigbergk
reba
s
e: fa
c
tor out com
m
and line option
p
rocessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von
Z
weig
b
e
rgk
rebase: alig
n
variabl
e
c
ontent
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigberg
k
reb
a
se: align variable
names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zw
e
igber
g
k
rebase: stri
c
te
r
check
o
f standalone
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
Zweigber
g
k
rebase: a
c
t o
n
command line outside pa
r
sing
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin
v
on Zwei
g
bergk
re
b
ase: improve d
e
t
ection
o
f
r
ebase in
progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase:
remove unu
s
ed rebase
st
a
te 'prev
_
head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin
v
o
n Zweigbergk
reba
s
e: read
s
tate outside loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
er
g
k
r
e
base: refactor reading of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigb
e
rgk
rebase: clearer
names for directory variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Marti
n
vo
n
Zwei
g
b
e
rgk
c
omplet
i
on: add missing config
u
ration variab
l
es
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin von
Zweigbergk
Use re
f
log i
n
'pull --rebase
.
f
o
o'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Marti
n
von Zweigbergk
r
ebas
e
: only show stat i
f
configured to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
M
artin vo
n
Zweigberg
k
re
b
ase --abo
r
t: do
not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Martin
v
on Zweigberg
k
rebase: support --veri
f
y
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zweigbe
r
gk
Documentation/git-pull: clarify configurati
o
n
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Ma
r
t
in von Zwe
i
gbe
r
gk
rebas
e
-X: do not clobber
s
tr
a
tegy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree