repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mm/maint-merge-ff-error-message-fix'
2009-11-21
Thomas Rast
describe: do not
use unanno
t
ate
d
tag even if exact
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas Rast
D
o
c
u
ment git-svn's fir
s
t
-parent rule
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas R
a
s
t
rebase docs: cl
a
rify --merge an
d
--strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-15
T
homas
R
ast
Documentation: c
l
arify 'ours' merge strate
g
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thomas Rast
f
i
lter-branch: neares
t
-ancestor rewritin
g
outside su
b
d
i
r
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Th
o
mas
Rast
filter-bra
n
ch: stop spe
c
i
al-ca
s
i
ng $filter_subdir argume
n
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-28
Thomas R
a
st
d
es
c
ribe:
w
h
en failing,
t
e
ll the user a
b
out
options
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Thomas
R
a
st
Quo
t
e
'
as
\(aq
i
n
manp
a
ges
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
stash lis
t
: drop the
d
e
fault limit of 10 stashes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
stash list: use new %g
f
ormats in
s
t
ead of sed
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
homas
Rast
Introduce new
pre
t
t
y format
s
%g[sdD] for reflog inf
o
r
m
ation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas R
a
s
t
reflog-wa
l
k: refactor the branch@{nu
m
} f
o
rmatting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Tho
m
as
R
ast
Refactor pret
t
y_print
_
commit argu
m
ents into a str
u
ct
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Rast
Let --
d
e
c
ora
t
e show HEAD posi
t
i
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Tho
m
as Rast
bash completion: comp
l
ete refs for git-grep
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
D
W
IM
'git sta
s
h
save -p' for 'git sta
s
h -p'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
Im
p
lement
'git stash sa
v
e --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Th
o
m
a
s R
a
s
t
Implement
'
git c
h
e
c
kout --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
T
h
omas Rast
Implement '
g
it reset --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
ad
d
-p:
do
n
ot attemp
t
to coales
c
e m
o
de chan
g
e
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
builtin-add:
refactor the m
e
at of interactive_ad
d
()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
Add a
small pat
c
h-mode tes
t
i
n
g
libr
a
ry
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
g
it-apply--int
e
ract
i
ve: R
e
factor pat
c
h mod
e
c
o
de
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Th
o
mas Rast
gitk: Parse a
r
b
i
trary c
o
mmit-ish in SHA
1
field
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Ras
t
gitk: Fix d
i
rect
i
on of symmetric
d
i
f
f
e
r
en
c
e
i
n
o
pti
m
ized
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thoma
s
R
a
s
t
g
i
tk: New option
t
o hide remot
e
refs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
Thomas Rast
Docu
m
en
t
'stash clear' recov
e
ry
via unreachable
commits
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
T
h
omas Rast
Disa
b
le
asciido
c
8
.
4
.
1+
s
e
mant
i
cs for `{plu
s
}` and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
T
e
s
t grep --
a
n
d/--or/--not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thom
a
s R
a
s
t
Tes
t
git archive --
r
emote
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
U
s
e di
e
_errno()
i
n
stea
d
of die() when checki
n
g
sysc
a
lls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas
R
a
st
Conv
e
rt
existing
die
(
.
.
.
,
st
r
e
r
ror(errno)) to die_errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thom
a
s R
a
st
Introdu
c
e die_errno
(
) th
a
t appends strerror(
e
rrno
)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas
Rast
git-svn:
l
et
'dcommit $r
e
v' work on $rev instead o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Thomas Rast
D
o
cumentati
o
n: refer to gitwork
f
lows(7) from tutorial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
Thomas Rast
add -
i
: do not dump patch du
r
ing applicati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Thoma
s
Rast
Documentation: teach stash/p
o
p wor
k
flow
i
nst
e
ad o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
Th
o
mas Rast
D
o
cumentat
i
on: tea
c
h stash/pop workflow in
s
tead
o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Rast
b
a
s
h
completion:
only sh
o
w 'log --merge'
if merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thoma
s
R
ast
D
o
cumentat
i
o
n:
format-patch --root clarificatio
n
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thom
a
s Rast
Docu
m
en
t
ation: f
i
lter-
b
ran
c
h:
s
how --ign
o
re-u
n
match
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
s
en
d
-email: test --
n
o-thread --in-reply-to co
m
binatio
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Thomas Rast
send-email: respect in-reply-to reg
a
r
dles
s
of thr
e
ading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thom
a
s Rast
f
o
r
mat-patch: support deep threadin
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Ras
t
form
a
t
-
p
atch:
t
hread
a
s r
e
ply
t
o cover le
t
ter eve
n
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Th
o
ma
s
R
a
st
f
ormat-pa
t
ch:
track several references
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Te
s
t git-patch-id
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
homas
R
ast
Test
rev
-
list --parents
/
--children
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thoma
s
Rast
T
e
s
t log --decorate
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas
R
a
st
T
est fsck a bit
harder
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test
l
og --graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Ras
t
Test d
i
ff --dirstat fu
n
ctionality
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test that di
f
f ca
n
read from std
i
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Tho
m
as Rast
S
u
pport covera
g
e
t
e
sting with GCC/gcov
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
f
ormat
-
patch: thr
e
ading test
r
eactivati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Rast
bash
c
ompletion:
o
n
ly sh
o
w 'log --merge' if mergin
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
T
h
o
mas Ras
t
bash complet
i
on: refactor common log, sh
o
rtlog and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-15
Th
o
m
as Rast
Docum
e
ntation: pruning reci
p
e
f
o
r destruc
t
ive
filte
r
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-14
Thomas
Rast
log:
d
o
n
ot print elli
p
ses with --a
b
b
r
ev-co
m
mit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-07
Thom
a
s Ra
s
t
add -p: import Te
r
m::
R
e
a
dKe
y
with '
r
equi
r
e'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Thomas Rast
add -p:
print
e
rrors in s
e
parat
e
col
o
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Thomas Rast
a
dd -
p
: pr
o
mpt for s
i
ngle characters
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Rast
contrib git-resurrec
t
: find traces of a b
r
anch n
a
me
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas 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 R
a
st
add -p: change prompt
separator for '
g
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Rast
bash: off
e
r to
show (un)st
a
ged changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-02
T
h
omas R
a
s
t
t3412: use log|name-
r
ev instead of log
--g
r
aph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-31
Thoma
s
Rast
t3412:
c
lean up GIT_EDITOR usage
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-25
T
ho
m
as Rast
t1505: remove deb
u
gging cruft
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Thomas Rast
b
a
sh
compl
e
tion: refactor d
i
ff o
p
tions
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Thoma
s
Rast
ba
s
h
completion: m
o
v
e
p
ickaxe op
t
i
ons to log
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas Rast
checkout: impl
e
ment
"
-" abbreviation,
a
dd
d
o
cs and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas Rast
sha1_nam
e
: suppor
t
@
{
-N} syntax in get
_
sha1()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas Ra
s
t
sha1_name: tweak @
{
-N} loo
k
up
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Th
o
mas R
a
st
color-wor
d
s
:
make
regex configurable
v
ia attri
b
utes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thomas Rast
co
l
o
r
-words:
expand
docs with precise semantics
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
T
homa
s
Rast
c
ol
o
r
-words: enable
R
E
G
_NEWLI
N
E
t
o
h
elp user
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-13
Thoma
s
Rast
n
otes: fix core
.
n
o
tesR
e
f docum
e
ntatio
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas Rast
rebase: update
documentation for
--ro
o
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas Rast
rebase -i: learn to rebase root
c
ommit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas Rast
re
b
a
s
e
: learn to rebase root commi
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Rast
diff
-
-n
o
-index -q: f
i
x endless loop
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
T
h
o
m
as Rast
d
i
ff --no-index: test for pager after
option parsing
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Ras
t
diff: accept -- wh
e
n
using --no-index
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-03
Thomas
R
ast
reb
a
se -i: exe
c
ute hook only after argumen
t
checking
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-12-07
Th
o
mas Ra
s
t
f
etc
h
-pack: Avo
i
d memcp
y
()
w
i
t
h src==dst
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-26
Thomas Rast
a
d
d
-p: warn
if onl
y
b
inary changes present
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-19
T
h
omas Ras
t
Documentat
i
on
:
add
m
anpage about workflows
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-12
T
h
o
m
as Rast
Documentation: re
m
ove
s
tale howto/rebase-
a
nd-edit
.
txt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-19
T
h
omas R
a
s
t
sha1_
f
ile: li
n
k
() returns -1 o
n
failu
r
e
, n
o
t errno
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
T
h
omas Rast
D
o
c
umentat
i
on: Refer t
o
git-rebas
e
(1) t
o
warn against
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Thomas
Rast
D
ocu
m
entation: new upstream re
b
ase recovery se
c
tion
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Tho
m
as Rast
gi
t
-svn: fi
x
'inf
o
' t
e
sts fo
r
unknown item
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas
Rast
g
i
t-svn: match
S
VN 1
.
5 behaviour of info' on unkn
o
w
n
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas
R
a
s
t
git svn info: always qu
o
te URLs in 'in
f
o' outpu
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas
R
a
st
git
s
vn info: make
i
nfo rel
a
tive to the current directory
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
T
h
omas Rast
gi
t
svn inf
o
: t
e
sts
:
f
i
x ptou
c
h argumen
t
order in setup
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Th
o
mas Rast
git svn i
n
fo:
t
ests: use test_
c
mp i
n
stead of git-diff
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Tho
m
as
Rast
git
s
vn info:
t
e
sts
:
d
o
not u
s
e set
-
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
g
i
t
svn inf
o
: tests: le
t
'i
n
it' test r
u
n with SVN 1
.
5
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next