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 'ic/maint-rebase-i-abort' into maint
2010-06-11
Thoma
s
Rast
t/READM
E
: document --root
opt
i
on
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-17
T
h
oma
s
R
a
st
c
ombined diff
:
correctly ha
n
dle truncated file
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-29
Thomas R
a
st
rebase
-i: make post-r
e
wr
i
te work fo
r
'edit'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-17
Thoma
s
Rast
Documen
t
a
tion: re
c
eiv
e
.
d
enyCurrentB
r
a
nch d
e
f
a
ults
to
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Rast
git
-
notes(1): add a sec
t
io
n
abo
u
t
the mean
i
ng of h
i
story
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Rast
notes: track whether no
t
es_
t
rees we
r
e
c
hanged at
all
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s R
a
st
n
o
tes: a
d
d shortha
n
d
--r
e
f
to override GIT_NOTES_REF
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Rast
commit --amend: c
o
py notes to t
h
e new comm
i
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
r
eb
a
s
e:
s
uppor
t
auto
m
atic notes copying
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
mas Rast
notes
:
i
mplement helpe
r
s needed fo
r
note
c
o
pying during
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
notes: imple
m
e
nt 'git n
o
tes copy --stdin'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
rebase -i: invoke post-rewrit
e
hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas R
a
st
rebase: invoke
p
ost-rewrite hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as
R
a
s
t
c
o
mmit --amend: inv
o
k
e post-r
e
w
rite hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas R
a
st
Do
c
umentation: documen
t
p
o
st-rewrite hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas Rast
S
upport showing n
o
tes from mo
r
e than one notes tree
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as R
a
s
t
t
e
st-lib: unset
GIT_N
O
TES
_
REF to
s
top it from influen
c
ing
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
T
h
o
mas Rast
c
herry_pick
_
list: quit early if one si
d
e is empty
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
T
h
omas Rast
t1450:
f
ix testcases that wer
e
wrongly expecting failure
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-16
Thomas
Rast
s
tash pop: remove 'apply
'
options
d
uring 'drop' i
n
vo
c
a
t
ion
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-10
Thomas Ras
t
Document
a
tio
n
: quote
b
races in
{u
p
stream} not
a
ti
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
Thoma
s
R
a
st
Docume
n
tati
o
n
:
move
away misplaced 'push
-
-upstream
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
Thomas Rast
Documenta
t
ion: add miss
i
ng :: in
config
.
txt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-22
Thomas Rast
Document
a
t
ion: improve description of -
-
glo
b
=p
a
tt
e
r
n
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Documentation
:
emph
a
sise 'git
sho
r
tlog'
i
n its synopsis
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Documen
t
a
tio
n
: show-file
s
is now called g
i
t-ls-file
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Documentation: spell 'git cmd' wi
t
hout dash throughout
commit
|
commitdiff
|
tree
2010-01-10
Thom
a
s
Rast
Documentation:
f
orm
a
t
ful
l
c
o
mmands in ty
p
ewriter
f
o
nt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Tho
m
as Rast
Documentation: warn prominently a
g
a
i
ns
t
merging w
i
th
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Rast
Documentation/git-merge: reword references
t
o "remote
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
bash completion
:
fact
o
r submodule
s
into d
i
rty state
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-21
Thomas Rast
describe: do not use unannotated tag
e
ven i
f
exact
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas Ras
t
Document git
-
svn's first-pa
r
ent rule
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas Rast
rebase d
o
cs:
clarif
y
--merge and --
s
trategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-15
T
h
omas Rast
Documentation: clarify
'ours' merge strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
T
ho
m
as R
a
st
filter-
b
r
a
nch: nearest-ancestor rewriting o
u
tsi
d
e subdir
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thomas Rast
filter
-
branch: stop special-casi
n
g
$
f
ilter_subdi
r
argume
n
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-28
Th
o
mas
Ra
s
t
d
e
scribe: w
h
en faili
n
g,
t
ell the user abo
u
t
options
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Thomas Rast
Quo
t
e ' as \
(
aq
i
n m
a
npage
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thom
a
s
R
a
s
t
stash list:
drop the default limit of 10 stash
e
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
stash list: use new
%
g
f
orma
t
s
i
nst
e
ad
o
f sed
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
In
t
r
od
u
ce n
e
w
p
retty form
a
ts %g[sdD] for ref
l
og information
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Tho
m
as Ras
t
reflog-walk: refa
c
tor the branch@{num} for
m
atting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
h
omas Rast
Refa
c
t
o
r p
r
etty_print_commi
t
argu
m
ent
s
i
n
to a st
r
uc
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Th
o
ma
s
Rast
Le
t
-
-
decora
t
e sho
w
HEAD position
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Rast
bash comple
t
ion
:
c
omple
t
e refs for git-grep
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thom
a
s Rast
DWIM 'gi
t
s
t
ash save -p' for 'g
i
t sta
s
h -p'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thom
a
s Rast
Imp
l
emen
t
'git stash
s
ave --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas R
a
st
Im
p
lement
'
git checkout --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas
Rast
Imple
m
e
nt
'git
reset --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas
Rast
add -p: d
o
not attempt to coalesce m
o
de cha
n
ges
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
Add a sm
a
ll patch-mode testin
g
libr
a
ry
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas
R
ast
built
i
n
-
add: refa
c
to
r
the
meat of inter
a
ctive_add()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
T
homas Rast
git-a
p
ply--in
t
e
r
active:
R
efactor p
a
tch
mode co
d
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
T
ho
m
as
R
ast
gitk: Parse arbi
t
rary co
m
mit-ish in S
H
A1 fi
e
ld
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Rast
gi
t
k:
F
ix direction of s
y
mmetri
c
differenc
e
i
n
optim
i
zed
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thom
a
s Ras
t
gitk
:
New option to hide re
m
ote refs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
Thomas Rast
D
o
cu
m
ent
'
stash clear' re
c
overy via unreac
h
able
comm
i
ts
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Thoma
s
Rast
Disable asciidoc 8
.
4
.
1+ semantics fo
r
`
{
pl
u
s}` and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
Test grep --and/
-
-or/-
-
no
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
T
homas Rast
T
e
s
t git archive --remo
t
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Th
o
ma
s
Rast
Us
e
die
_
err
n
o() i
n
s
t
ead of d
i
e() wh
e
n check
i
ng syscalls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thom
a
s Rast
Co
n
ve
r
t exist
i
ng
d
ie(
.
.
.
, st
r
e
r
ror(errno)) to die
_
errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas
R
a
st
Introd
u
ce die
_
errno() that appends strerror(errn
o
)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas
R
a
s
t
g
i
t
-
s
vn
:
let 'dcommit $re
v
' work on $rev instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Th
o
ma
s
R
a
s
t
Documentation: re
f
er to git
w
o
r
kflows(7) from
tutorial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
T
h
o
mas Rast
a
d
d
-i
:
do not dump patc
h
during applicati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
T
h
o
m
a
s
R
ast
Documentation:
teach stash/pop
wo
r
k
f
l
o
w instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
Thomas Rast
Documentation: teach
s
ta
s
h/pop workflo
w
ins
t
ead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Thoma
s
Rast
bash
c
ompletion: o
n
ly show 'log
-
-merge' if merg
i
ng
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
Document
a
t
i
o
n: format
-
patch -
-
root
clarifications
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
T
homas Rast
Documentation: filter-b
r
anc
h
:
sho
w
--ignore-unmatch
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Ras
t
s
en
d
-em
a
i
l: test --
n
o
-
thread --in-
r
e
ply-t
o
combination
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
T
h
omas Ra
s
t
s
e
nd-e
m
ail: respect i
n
-reply-to regardl
e
ss o
f
threa
d
i
n
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
format-p
a
tch: supp
o
rt
d
eep threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
for
m
a
t-patch: thread as
r
eply
t
o cover let
t
er even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
for
m
a
t
-patc
h
: track several references
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Tho
m
as Rast
Test git-patch-id
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test rev-list --parents/--children
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test log --decorate
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
o
m
as
R
a
s
t
Test fsck a bit harde
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Th
o
mas R
a
s
t
T
est log --graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
homas Rast
Test diff --dirs
t
at
functionality
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test that di
f
f can re
a
d
f
rom
s
tdin
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Suppo
r
t
cover
a
ge testin
g
wi
t
h GCC/gco
v
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas R
a
st
format-patch: threading test re
a
ctivatio
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Rast
bash completion: only show 'lo
g
--merge' if
m
erging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Rast
bas
h
com
p
letion
:
r
efa
c
tor common log, shortlog and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-15
Thom
a
s Rast
Documentation: pruni
n
g re
c
ipe for destr
u
ctive filter
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-14
Thomas Rast
log: do
not prin
t
ellipses w
i
th
-
-abbrev-com
m
it
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-07
T
homas Ra
s
t
a
d
d -p
:
i
m
port Term::ReadKey with 'require'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Thomas Ras
t
add -p
:
print
e
rror
s
in separate
c
olor
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Thomas Rast
a
dd -p: pr
o
mpt for single characters
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas R
a
st
contr
i
b g
i
t-resurre
c
t: fi
n
d tra
c
e
s o
f
a
b
ranch
n
ame
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thom
a
s Rast
add -p: trap Ctrl-D in 'goto' mode
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Ra
s
t
add -
p
: c
h
a
nge prompt
s
e
pa
r
ator for 'g'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
T
h
omas Rast
bash: offer to show (un)staged changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-02
T
homas Rast
t341
2
: use log|
n
ame-r
e
v instead of log --graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-31
Thomas
Rast
t3
4
1
2: cl
e
an
u
p GIT_EDITOR
u
sage
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-25
Thomas Rast
t1505:
r
emove debu
g
g
i
ng cruft
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next