repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sb/maint-octopus' into maint-1.6.5
2009-12-31
Thomas
R
ast
bash comp
l
etion
:
facto
r
submodules i
n
to dirty state
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Thomas R
a
st
Quote ' as \(aq in manpages
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thoma
s
Rast
DWIM 'git
s
tash save
-p' for 'git stash -p'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
Implement
'
g
i
t
stash save --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas
R
ast
Impleme
n
t 'gi
t
c
h
e
c
k
o
ut
--patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
T
h
o
mas Rast
Im
p
lement 'g
i
t
r
eset --patch
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Ra
s
t
add -p: do no
t
attempt t
o
coalesce
mode ch
a
nges
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas R
a
st
bu
i
l
t
in-a
d
d:
refactor the meat of
i
n
teractiv
e
_add()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thoma
s
Ras
t
Add a small p
a
t
ch-mode testing l
i
bra
r
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
g
i
t
-a
p
ply
-
-in
t
e
ra
c
ti
v
e:
Refactor patch mode code
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas
R
a
s
t
gitk: Parse arbitrary co
m
m
i
t-ish in
S
HA
1
field
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thom
a
s
R
ast
g
itk:
Fix d
i
rection of symmetric differenc
e
in optimized
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
T
homa
s
Rast
gitk: New
option to hide remo
t
e
r
efs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
T
h
o
m
a
s Rast
Document 'stash clear' re
c
o
very
v
ia unreachable
c
om
m
its
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Thomas Rast
D
i
sable
a
sci
i
d
o
c 8
.
4
.
1
+ semantics
f
o
r
`{plus}` and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Tho
m
as Rast
Test g
r
ep --
a
nd/--or/
-
-not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Ra
s
t
Test g
i
t
arch
i
ve --remote
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Th
o
mas Rast
U
se die_errno() ins
t
ea
d
of di
e
() whe
n
checking sysca
l
ls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thoma
s
Rast
C
o
nvert existing die(
.
.
.
,
s
tr
e
rror(errno)) t
o
die_errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Tho
m
as
R
ast
Int
r
oduce die_
e
r
r
no() that appen
d
s strerror(errn
o
)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas Rast
git
-
svn: let 'dcom
m
it $r
e
v
' work on $
r
ev in
s
tead o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Th
o
mas Rast
Docum
e
ntation: refe
r
to gitworkflows(7) from
t
uto
r
ial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
T
h
omas Ra
s
t
ad
d
-i: do not dump patch duri
n
g
a
pplica
t
ion
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Thomas R
a
s
t
Docum
e
ntation: teach
s
t
a
sh/p
o
p
workfl
o
w instead
of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
T
h
omas Rast
Documentation: teach s
t
ash
/
pop workflow instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Tho
m
a
s Rast
bash completion
:
only show 'log --merge' if merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Ras
t
D
ocumentation: format-patch --root clar
i
f
i
c
a
tions
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Th
o
m
a
s R
a
st
Docume
n
t
ation: filt
e
r-branc
h
:
show --ig
n
ore-unmatc
h
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas
R
as
t
sen
d
-email: t
e
st --no-th
r
ead --in
-
reply
-
to combi
n
atio
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Th
o
mas Rast
send-email:
r
espect in-reply-to
r
egardle
s
s
o
f threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Th
o
mas Rast
format-patc
h
: support deep th
r
e
a
d
i
n
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas
Ra
s
t
forma
t
-patch: thread as reply
t
o cover letter even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
T
h
omas Rast
forma
t
-p
a
tch: track several ref
e
renc
e
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas
R
ast
Test git-patch
-
i
d
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test rev-li
s
t --pare
n
t
s
/--childre
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Ra
s
t
Test log --dec
o
rate
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
homas Rast
T
e
st fsck a bit harder
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
omas Rast
Test lo
g
--graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
o
mas Rast
Test
di
f
f --di
r
stat fu
n
ctionality
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
ho
m
as Rast
Tes
t
t
h
at diff can read from stdin
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
S
u
ppor
t
cov
e
r
a
ge testin
g
w
ith GCC/gcov
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Tho
m
as
R
ast
format-
p
a
t
ch: threa
d
i
ng test reactivation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Rast
bash comple
t
ion: only show 'log --merge' if merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Th
o
mas
R
a
st
bash c
o
mpletion: refactor common log, shortlog and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-15
Tho
m
as
R
ast
Documentation: pruning r
e
cipe for destructive filter
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-14
T
h
omas
Rast
lo
g
:
do not print
e
ll
i
pses with --
a
bb
r
ev-commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-07
Thomas
Rast
add -p: import Term::ReadKey with
'
requ
i
re'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Thom
a
s Rast
add
-
p: print er
r
ors
in separa
t
e color
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Thomas Rast
add -p: prompt for single characters
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
T
h
omas Ra
s
t
contrib git
-
resur
r
ect:
f
ind traces
o
f a
b
ranch
name
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Th
o
mas Rast
add -p: trap Ctrl
-
D
i
n 'goto' mode
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Tho
m
as Ra
s
t
add -
p
: change prom
p
t separa
t
or
fo
r
'g'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Rast
ba
s
h:
o
ffer
t
o show (un)staged changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-02
Thomas Ras
t
t3412: use log
|
name-rev instead of
l
og --graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-31
Thom
a
s Rast
t3412: clean up GIT_EDIT
O
R u
s
age
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-25
Th
o
mas Rast
t1
5
05: remove debugging cruft
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Thomas Ras
t
bash comp
l
etion: r
e
f
a
ct
o
r
diff opt
i
ons
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Tho
m
as Rast
b
ash completion: mo
v
e pic
k
a
xe
o
pt
i
o
n
s to
l
o
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas Rast
c
h
ec
k
out: implement "-" abbrevi
a
tio
n
,
a
dd docs and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
T
ho
m
as
R
ast
sha1_name: support @{-N}
s
yntax in get_sha1()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas Rast
s
h
a1
_
nam
e
:
t
weak @{-N} lookup
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thomas R
a
st
color
-
words: make rege
x
configurable via attributes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thomas Rast
color-w
o
r
ds: expand docs with precise semantic
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thomas
R
as
t
c
o
l
o
r
-words: en
a
ble REG_NEWLINE to h
e
lp u
s
e
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-13
Thomas R
a
s
t
notes: fix co
r
e
.
notesRef documentation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas Ra
s
t
rebase: upda
t
e
d
ocume
n
t
a
tion f
o
r --root
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Th
o
mas Rast
rebase -i:
learn
t
o reba
s
e r
o
ot commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas
Rast
rebase:
l
earn
to rebase root co
m
mit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas
R
a
st
d
iff --
n
o-index -q:
fix endless loop
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Tho
m
as Ras
t
diff --no-in
d
ex
:
tes
t
for page
r
after
option parsing
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
T
h
o
m
a
s
Rast
diff: accept -- when us
i
n
g
--
n
o-
i
n
d
ex
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-03
Th
o
mas
R
ast
r
ebas
e
-i
:
execute
hook only after argumen
t
c
hecking
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
as Rast
fetch-pack: Avoid
m
emcpy(
)
with src==dst
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-26
Thomas Rast
add -p
:
w
arn i
f
only binary c
h
a
n
ge
s
pr
e
sent
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-19
Thom
a
s Rast
Documentation: add
m
a
n
page abo
u
t
workflow
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-12
Tho
m
as Rast
Doc
u
m
entation: remove stale
h
owto/re
b
ase-
a
nd-edit
.
tx
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-19
Th
o
m
a
s Rast
sha1
_
file: link() retu
r
n
s -1 on
failure,
n
ot err
n
o
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Thomas
R
ast
D
ocum
e
ntati
o
n: Refer to
git-reb
a
se(1) to warn aga
i
nst
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Th
o
mas Rast
D
o
c
u
mentation: new upstream reba
s
e
recovery se
c
t
i
on
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thoma
s
Rast
git-
s
vn: fix 'i
n
f
o' tests
f
or
unkno
w
n
i
tems
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Th
o
mas Rast
git-svn: match SVN 1
.
5 be
h
a
viour of info' on
u
nkno
w
n
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas
R
ast
git
s
vn
i
n
fo
:
a
l
ways quo
t
e UR
L
s
in 'info' output
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Ras
t
git svn info: make
i
n
f
o
r
e
lative to the cur
r
ent dir
e
ctory
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas
R
a
s
t
git svn
i
nfo: te
s
ts:
fix
p
touch arg
u
ment
ord
e
r
in setup
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
git svn info: tests: use test_cm
p
instead of gi
t
-diff
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thoma
s
Rast
g
i
t svn i
n
fo:
tests: do no
t
use
s
e
t
-
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
T
h
o
ma
s
Ra
s
t
g
i
t svn info: tests: let 'init
'
test
r
u
n with SVN 1
.
5
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
T
homas Rast
git svn
:
catch lack of upstream info for dcommi
t
e
a
rlier
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-31
Thomas Rast
t6013: repl
a
ce use o
f
'
t
ac' with equi
v
alent Perl
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-30
T
h
omas
Rast
re
v
-lis
t
: fix
-
-reverse interaction wi
t
h --
p
arent
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thom
a
s
R
ast
reba
s
e
-
i
-
p
: fi
x
parent rewriting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
rebase -i -p: handle
i
ndex and
w
orkdir correctly
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
Documentation: rev
-
list
-
options: m
o
ve --s
i
m
p
lif
y
-merges
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thomas R
a
st
D
o
cum
e
ntat
i
o
n: rev-list-opt
i
ons: Rewrite
s
implification
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
T
h
oma
s
Rast
filter-branch: us
e
--simpl
i
f
y-merges
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
Rast
filt
e
r-branch: fix r
e
f rewriting with --subdirecto
r
y
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
T
homas Ra
s
t
filter-
b
ranch: Extend test to
show rewrit
i
ng bug
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-12
Th
o
mas
R
ast
D
ocume
n
tation: rev-list-
o
ptions: Fix a
t
ypo
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-11
Thomas Rast
Document
a
tion: rev-lis
t
-
o
p
t
ions:
Fix -g paragraph
f
o
r
m
atting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-08
T
h
omas
Rast
filte
r
-br
a
nch:
b
e more helpful
w
hen an annotated tag
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next