repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: clarify 'ours' merge strategy
2009-11-15
Thomas Rast
Document
a
tion: clar
i
fy 'ours' merge strat
e
gy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
DWIM
'git stas
h
sav
e
-p' f
o
r '
g
i
t
stash -
p
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas
Rast
Implement 'git s
t
as
h
sa
v
e --
p
atch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
Impl
e
me
n
t '
g
it checkout -
-
patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
T
homas
R
ast
Implement 'g
i
t
reset --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Ras
t
add -
p
: do
not attempt
to coal
e
sce mode
ch
a
nges
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
buil
t
in
-
a
d
d: r
e
f
a
c
t
or the meat of interactiv
e
_a
d
d()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
A
dd a
s
m
al
l
pa
t
ch-mode te
s
ting
l
ibra
r
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
T
h
o
mas Ra
s
t
git-apply--inte
r
act
i
ve: Refactor patch mode
c
o
d
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas
R
a
st
gi
t
k: Pars
e
arb
i
tra
r
y commit
-
ish in SHA1 fi
e
ld
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thoma
s
Rast
gitk: Fix direct
i
on o
f
symm
e
tric difference
in optim
i
zed
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas
R
ast
g
i
tk: Ne
w
opt
i
on to
hi
d
e
r
e
m
ote refs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
T
h
omas Rast
Document 'stash clear
'
recovery
v
ia
u
nr
e
achable commits
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Th
o
mas
R
a
st
D
is
a
ble as
c
iidoc 8
.
4
.
1
+
s
e
m
a
ntics for `{p
l
u
s
}`
and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
T
e
st grep --and/--or/--not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
T
h
omas Rast
Test git archive --remote
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
U
s
e die_e
r
rno() in
s
te
a
d of die
(
) when checking syscall
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thoma
s
Rast
Co
n
vert existing die(
.
.
.
, strerror(errno)) to
d
ie_err
n
o()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
I
ntroduce
d
ie_er
r
no() that ap
p
end
s
strerror
(
er
r
no)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas Rast
git
-
svn:
let '
d
commit
$rev' work on $re
v
instead
o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Thomas Rast
Documentation: refer to gitwork
f
lows(7) from tut
o
ria
l
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
Thomas Rast
ad
d
-i: do
n
o
t
dump patch durin
g
applicat
i
on
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Thomas Rast
Documentation: teach stash/pop workflow instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
T
h
omas Rast
Docu
m
entation: teach stash
/
pop work
f
l
ow instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Th
o
m
a
s
Rast
b
a
sh
comple
t
ion:
o
n
l
y
show
'l
o
g
-
-
m
er
g
e' i
f
m
erging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thom
a
s
R
ast
Documenta
t
io
n
: for
m
at-patch
-
-
r
oot
c
larificati
o
ns
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Tho
m
as
R
ast
Doc
u
m
e
nt
a
tion
:
f
il
t
er-branch: show --ignore-
u
nmatch
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas
Rast
send-email: t
e
st
-
-
no-th
r
ead
-
-in-r
e
ply-
t
o combination
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Thomas Rast
sen
d
-emai
l
: respect in-reply-to
r
egardless of th
r
ea
d
in
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
T
ho
m
as Rast
f
o
rmat-pa
t
ch: support deep t
h
r
eading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thoma
s
Rast
format-pat
c
h:
t
hr
e
ad as reply to cover let
t
er even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thom
a
s Ra
s
t
format-patch:
t
rac
k
several
refere
n
c
e
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thom
a
s Rast
Test git-patch
-
id
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
omas Rast
Test rev-list --parents/--
c
h
i
ldren
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test log --de
c
o
rate
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
omas Rast
Test fsck a bit
h
arder
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Th
o
mas
Rast
Test log -
-
gra
p
h
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Te
s
t diff --dirstat
f
unctional
i
ty
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
omas R
a
st
T
e
st that dif
f
c
a
n read
from
s
t
d
in
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
S
up
p
ort coverage testing with GCC
/
gcov
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thom
a
s Rast
format-p
a
tc
h
: threading test reactivation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
T
homas Rast
bash completion: o
n
ly
show '
l
og
--me
r
ge' if merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-18
Thomas Ra
s
t
bash completio
n
: refactor common log, sh
o
r
t
log and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-15
Tho
m
as Rast
Docum
e
ntation:
p
runing recipe fo
r
de
s
tructive filter
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-14
Thomas Rast
log:
d
o not pri
n
t el
l
ipses
w
ith
-
-abbre
v
-commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-07
Thom
a
s Rast
add -p: import 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 er
r
ors in
separate
co
l
o
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-06
Tho
m
as Rast
add -p:
pro
m
p
t
for single
c
haracters
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Ra
s
t
con
t
rib g
i
t-res
u
rrec
t
:
f
ind trac
e
s of
a
b
ranch
n
ame
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thomas Rast
add -p: trap Ctrl-D in 'g
o
t
o' mode
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thoma
s
Rast
add -p: change prompt separator for 'g'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-04
Thom
a
s
Rast
bash:
offer to show
(un
)
s
t
aged change
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-02
T
homas Ra
s
t
t3412: u
s
e log|name-rev instead of log --gr
a
ph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-31
Thomas
R
ast
t
3
41
2
:
cl
e
an up GI
T
_
E
D
I
TOR
u
sag
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-25
Thomas R
a
st
t1505: remove debuggin
g
cruft
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Thomas Rast
b
ash completi
o
n: refa
c
tor d
i
f
f
options
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-19
Thomas Rast
b
a
sh co
m
pletion: move pic
k
axe opt
i
ons to log
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
Thomas
R
a
s
t
checkout: i
m
plement "
-
" a
b
b
r
eviation
,
add docs and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
T
homas
Rast
sha1_name: support
@
{
-N
}
syn
t
ax in get_sha1()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-18
T
h
o
mas Ra
s
t
s
h
a
1
_name: twe
a
k @{-N} lookup
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Th
o
mas
R
a
s
t
c
olor-wo
r
ds: make r
e
g
ex configur
a
bl
e
via attrib
u
tes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Thomas Rast
color-words: expand
d
ocs with precise semant
i
cs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-17
Tho
m
as
R
ast
color-w
o
rds: e
n
able RE
G
_NEWLINE to
h
e
lp use
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-13
Thomas Rast
not
e
s: f
i
x
core
.
notesRef documentati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas
Rast
rebase: up
d
a
te documentation
for --root
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
T
h
o
m
as
R
ast
reba
s
e -i: lea
r
n to reb
a
se
r
oot
commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-12
Thomas Rast
reb
a
se: learn t
o
rebase root commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
T
h
o
mas Rast
diff
-
-no-inde
x
-q:
f
ix
e
n
d
less loop
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Rast
d
i
f
f --no-ind
e
x: test for pager after option parsing
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-07
Thomas Rast
di
f
f:
acce
p
t -- when usi
n
g
--no-
i
ndex
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-01-03
T
h
omas Rast
rebase -i: execute hook
o
nly after
a
r
g
ument ch
e
cking
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-12-07
Th
o
mas Ra
s
t
f
e
tc
h
-p
a
ck: Avoid memcpy() with src==dst
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-26
Thomas R
a
st
add
-
p
: warn if only bin
a
ry changes present
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-19
Thoma
s
R
a
st
Documentation: add manpag
e
ab
o
ut workflows
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-10-12
Thomas R
a
st
Documentati
o
n:
remove
stale howt
o
/re
b
a
se-and-ed
i
t
.
txt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-19
T
homa
s
Rast
s
h
a1_fi
l
e:
l
ink() returns -1
o
n failure, not errno
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Thomas Rast
Docume
n
t
ation:
Refer to
git
-
re
b
ase(1) t
o
warn
a
gainst
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-16
Thomas Rast
Docum
e
ntation: new u
p
stream
reba
s
e
recovery se
c
tion
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
git-sv
n
:
fix 'info
'
te
s
t
s f
o
r u
n
kno
w
n
i
tems
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
git-svn: match SVN
1
.
5 beha
v
iour
of info' on
u
n
known
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thom
a
s Rast
git
s
v
n
info: always quote
U
RLs
in 'info' output
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
T
h
omas Ra
s
t
g
it svn
i
nfo: make
i
nfo rela
t
i
ve
t
o th
e
curr
e
nt d
i
rect
o
ry
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
g
i
t
svn i
n
fo: te
s
t
s
: f
i
x
ptouc
h
argument o
r
d
e
r in se
t
up
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
T
homas Rast
git svn info: tests: use
t
est_cmp
i
n
s
tead of
g
it-diff
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
git svn info: tests: do no
t
use set -
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thomas Rast
g
i
t
s
vn
i
nfo: tests: let 'init'
t
est
r
un with
S
VN 1
.
5
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-09-05
Thoma
s
Rast
g
i
t svn: catch lack of upstream inf
o
for dc
o
mmi
t
earlier
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-31
Thomas R
a
s
t
t6013: replace
use o
f
'tac' with equivalent Pe
r
l
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-30
Thomas Rast
rev-lis
t
: fix --re
v
e
r
se interaction
w
i
th --parents
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
T
h
omas Ra
s
t
re
b
a
s
e -i -p: fix parent rewriting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Rast
r
ebase -i -p: handle index and workdir correctly
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thomas Ras
t
Documentat
i
on: rev-list-op
t
ions: mo
v
e --si
m
plify-merge
s
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
Rast
D
o
cumen
t
a
t
ion: rev
-
l
i
st
-
option
s
: Re
w
rite si
m
plif
i
cation
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
T
h
oma
s
Rast
filter-br
a
nch:
u
se --simplify-mer
g
es
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
T
homas Rast
filter-
b
r
anch:
fix ref re
w
r
i
ting with --sub
d
irectory
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-13
Thoma
s
Rast
fil
t
er-b
r
a
nch: Extend test to s
h
ow rewriting bug
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-12
Thomas Rast
Documentat
i
on:
r
ev-list-options: Fix a ty
p
o
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-11
Thom
a
s
R
as
t
D
o
c
umentation
:
r
ev-list-options:
Fix -
g
paragr
a
ph formatting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-08
Thomas Rast
filte
r
-branch: be more
h
elpfu
l
when an annotated tag
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2008-08-08
Thomas Rast
D
ocum
e
ntatio
n
: filter-branch: docum
e
nt how to
filter
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next