repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Doc: Improve shallow depth wording
2012-08-30
M
artin
von Zweig
b
ergk
cherry-pic
k
/revert: resp
e
ct order o
f
revisions
to
pick
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
Martin von Z
w
eig
b
er
g
k
demonstra
t
e
broken
'git cherry-pick three o
n
e two'
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-30
M
a
rtin
v
on Zweigb
e
rg
k
teach log --
n
o-w
a
lk=unsorted, which avoids sorting
Signed-off-by:
Martin von Zweigbergk
<martinvonz@gmail.com>
commit
|
commitdiff
|
tree
2012-08-09
Martin v
o
n Zweigbergk
add tests for
'
git r
e
b
a
se --
k
eep-empty'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-27
M
artin von Zweigbergk
ad
d
te
s
t case
for rebase o
f
empty c
o
mmit
commit
|
commitdiff
|
tree
2012-06-26
Martin von
Z
w
e
igbe
r
gk
am: don'
t
call mailin
f
o if $r
e
basing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
Ma
r
tin von Z
w
e
i
gbergk
am --rebasing: get p
a
t
c
h
bo
d
y from commit,
n
ot f
r
om
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2012-06-26
M
artin von Zweig
b
ergk
r
e
base --root:
p
r
i
nt
usa
g
e
on too many args
commit
|
commitdiff
|
tree
2012-06-26
Martin vo
n
Z
w
eigbergk
rebase:
don't source git-sh-setup t
w
ic
e
commit
|
commitdiff
|
tree
2011-12-12
Mart
i
n vo
n
Zwe
i
gbergk
t3401: use test_comm
i
t i
n
set
u
p
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-12
Martin von Z
w
eigbergk
t
3
401: mod
e
rni
z
e styl
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-12-09
Ma
r
tin von Zweigbe
r
g
k
am:
d
o
n
't persi
s
t keepcr flag
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
M
arti
n
von Z
w
eigbe
r
g
k
remote:
on
l
y
update remote-
t
racking
branch if
upda
t
ing
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von Zweigbergk
remote
r
e
n
ame: warn
when re
f
spec was not update
d
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Martin von
Z
w
e
i
gbergk
rem
o
te: "r
e
name
o foo
"
s
hould not
r
e
na
m
e ref "origin
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-09-12
Mart
i
n von
Z
weigbergk
re
m
ote: write correct
fetch
s
p
ec wh
e
n renaming remo
t
e
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin
von Z
w
eigbergk
g
itk: Show modified fil
e
s w
i
th separate w
o
r
k tr
e
e
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mart
i
n von Zw
e
igbergk
g
itk: Simplify calc
u
lat
i
on of gitdir
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zweigbergk
gi
t
k
: Run 'git
rev-
p
a
rse --
g
it-dir' only
o
nce
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
a
rtin
v
o
n Zweigbergk
git
k
:
P
ut te
m
p
o
ra
r
y d
i
r
ector
y
ins
i
de
.
git
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
M
artin von Zwe
i
gbergk
gitk: F
i
x "Ext
e
rnal diff" with
separa
t
e w
o
rk tree
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Marti
n
von
Zwe
i
gber
g
k
git
k
: Fix "blame parent commit"
with se
p
a
rate work
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Mar
t
in v
o
n Zw
e
igbe
r
gk
gitk: Fi
x
"show origin of
this line" with se
p
arate
.
.
.
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-24
Martin von
Zweigbergk
gitk: Fix file highligh
t
when
run
i
n su
b
dir
e
ctory
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-14
Ma
r
tin von Zweigbergk
r
e
b
a
se:
clarify "restore the
original
branch"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-07-06
M
a
r
t
in
v
on Zweigbergk
Docume
n
tation: u
s
e
[
ver
s
e] for S
Y
NOPSIS sectio
n
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-24
Mar
t
in von Zweigbergk
di
f
fcore-re
n
ame:
don't consider unmerged path as source
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-03-05
Martin von Zwei
g
bergk
rebase: defin
e
options
i
n OPTIO
N
S_S
P
EC
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-25
Martin von Zw
e
igb
e
rgk
Makefil
e
: do not i
n
stall
s
o
urce
d
r
e
base scripts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
M
a
rti
n
von Z
w
e
i
gbergk
merget
o
ol:
d
on't
s
kip
m
odify/remove conflicts
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-16
Martin von Zweigbergk
rerere "remaining"
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zweigbergk
re
b
ase: use @{upst
r
eam
}
if
no up
s
tream
specified
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbe
r
g
k
r
ebase -
i
: remove unnecessary state rebase-root
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
ergk
reb
a
se -i:
don't read
u
nused
v
ariable
pre
s
e
r
ve_
m
erges
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
r
t
in von Zweigbergk
g
it
-
rebase-
-
am: remove unne
c
essary --
3
way option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
reba
s
e
-
m:
d
on't p
r
int exit code 2 wh
e
n me
r
ge fails
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Zwei
g
bergk
re
b
ase -m: rem
e
mb
e
r allow_rerere_autoupd
a
t
e opt
i
on
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin v
o
n Zweigbergk
reba
s
e: remember st
r
ategy
and strate
g
y options
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
a
rtin von Zweigbergk
re
b
ase:
reme
m
ber verbo
s
e
option
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zwei
g
b
e
rgk
r
e
base
:
ext
r
act code for
writing basic state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zweigbergk
rebase: factor
o
ut sub comman
d
handling
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
ar
t
in von Zw
e
igbergk
rebase
:
make -v a
tiny bit more
v
e
r
bose
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von
Z
weigbergk
rebase -i:
a
lign var
i
a
b
le names
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mart
i
n von Zweigber
g
k
rebas
e
: show con
s
is
t
ent conf
l
ic
t
resolution h
i
n
t
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbe
r
gk
rebase: extract
a
m code to new so
u
rce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigbergk
re
b
ase: extract merge code to
new so
u
rce file
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Zweigbergk
reb
a
s
e
: remove $branch
a
s synonym for $ori
g
_
head
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
M
artin
vo
n
Zweigbergk
rebase
:
fact
o
r
out re
f
erence parsing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
r
ebase -i:
s
up
p
o
r
t
-
-stat
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin
von Zweigbergk
rebase: reorder validation steps
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von Zwe
i
gber
g
k
r
e
b
a
se:
f
actor
o
ut c
a
ll to pre-
r
ebas
e
hook
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigberg
k
rebase -i: remove now unneces
s
ar
y
direct
o
ry
c
he
c
ks
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweig
b
e
rgk
reb
a
s
e
: facto
r
o
ut cle
a
n work tr
e
e
c
heck
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
in von Zweigber
g
k
rebase: fact
o
r ou
t
comman
d
line
optio
n
p
r
ocessing
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigbergk
rebase: align
v
ariable content
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von Zweigber
g
k
reba
s
e
:
a
lign variable
n
am
e
s
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
tin von
Z
we
i
gbergk
r
e
base:
s
t
r
icter check
of standalone
sub
command
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Ma
r
ti
n
von Zweigbergk
rebase: act on command line
outsi
d
e parsing loop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Marti
n
von Z
w
eigbergk
r
e
base: improve detection of reba
s
e
in progress
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin vo
n
Z
w
e
igbergk
re
b
ase:
r
emov
e
unused re
b
ase
sta
t
e
'
prev_head'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Mar
t
i
n von Zweigbergk
rebase:
read
state outsi
d
e
l
oop
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin v
o
n Zwe
i
g
b
erg
k
rebase: refa
c
tor
r
ea
d
ing of state
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2011-02-10
Martin von
Zweigbergk
r
e
base: clearer
names
for
direct
o
ry
varia
b
les
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-12-21
Martin von Zweigbergk
c
o
mpletion: add missing configuration variables
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
M
a
r
tin
v
on Z
w
eigb
e
rgk
Use
reflog in 'pull --rebase
.
foo
'
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-29
Martin
v
on Zw
e
igber
g
k
rebase:
o
nl
y
sho
w
stat if config
u
red to true
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-24
Mart
i
n
von
Zweig
b
ergk
reba
s
e --ab
o
r
t
:
do not update branch ref
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-23
Marti
n
von Zweigbergk
rebase: su
p
port --verify
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-17
Martin von Zw
e
igbergk
Docu
m
entation/git-
p
u
l
l: cla
r
ify configu
r
a
t
ion
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree
2010-11-10
Martin
v
on
Z
w
e
igbergk
rebas
e
-X:
d
o
not clobber strategy
Signed-off-by:
Martin von Zweigbergk
<martin.von.zweigbergk@gmail...
commit
|
commitdiff
|
tree