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
git notes merge: Handle real, non-conflicting notes merges
2010-08-09
Thomas Rast
t7
0
03: fix subdirect
o
r
y-fil
t
e
r
test
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-08-02
T
h
omas
R
ast
Docume
n
tation/
r
ev-parse: quo
t
ing is
r
equired with
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-27
T
h
omas R
a
st
M
akefile: add check-d
o
cs
e
xception for
gitrevisions
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Fix 'git' wrapper
usage stri
n
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thomas R
a
st
Documentation/git-push: Explain
status out
p
u
t in more
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Doc
u
m
en
t
r
e
cei
v
e
.
d
e
nyDeleteCurrent
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Ras
t
Cast ex
e
cl*() NULL
sentinels
to (cha
r
*)
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-16
T
hom
a
s Rast
Only run a
g
g
r
e
gate-results o
v
er actual counts
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-18
Thomas Rast
send-e
m
a
il: ask about and declar
e
8bit mails
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-13
Thomas Rast
par
s
eopt
:
wrap rev-parse -
-
p
a
r
seopt usage fo
r
eval
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-12
Thomas Ras
t
r
e
v-list: introduce --count
o
ption
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-12
Thom
a
s
R
a
s
t
lo
g
_
r
e
f
_set
u
p: don't ret
u
rn
s
t
a
ck
-
allocated array
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
T
h
o
m
as Ras
t
check_aliased_update: str
c
p
y() instead of
s
trcat()
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Thomas Ras
t
t/README: d
o
cum
e
nt
--root opt
i
on
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Thomas Ra
s
t
fas
t
-i
m
port: die_nicel
y
() back to vsnp
r
intf
(reverts
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-05-21
Thomas
R
a
s
t
Complete
prot
o
t
y
pe
of git_co
n
fig_from_pa
r
a
m
eters()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-17
Thomas
Ras
t
combi
n
ed diff: c
o
rrectly
h
and
l
e truncated
f
ile
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-14
Tho
m
as Ra
s
t
d
i
ff: ad
d
--word-dif
f
op
t
ion that g
e
neralizes --col
o
r
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-29
Thomas Rast
rebase -i: make post-rewrite
work
f
or
'
edit'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-17
Thomas R
a
st
Docum
e
ntation: receive
.
d
e
nyCurren
t
B
ranch defaults to
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
T
h
oma
s
Ras
t
git-notes(1): ad
d
a section about the mean
i
ng of
history
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
n
o
t
es: t
r
ack whe
t
her note
s
_trees were changed at all
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
n
otes: add sho
r
t
hand --ref to override GIT_NOTES_R
E
F
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
commit
--amend: copy notes to the new
c
om
m
i
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
mas
Rast
rebase:
support
a
ut
o
m
a
t
ic notes copyi
n
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
note
s
: impleme
n
t h
e
lpers needed f
o
r no
t
e cop
y
ing during
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
notes: implemen
t
'git notes co
p
y
-
-stdin'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Ras
t
rebase -i: invoke post-rewrite ho
o
k
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
T
h
omas
R
a
s
t
r
ebase: i
n
voke post-rewrite
h
o
ok
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
com
m
it --amen
d
: inv
o
ke pos
t
-rewrite hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
Documentation: document post-rewrite
h
o
ok
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
Suppo
r
t showing not
e
s from more than one notes tre
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
test-
l
i
b
: unset GIT_NO
T
ES_
R
EF t
o
stop it from
i
nflu
e
n
cing
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
T
homas Rast
che
r
ry
_
pick_
l
ist: quit
early
if one side is empty
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
Thomas Rast
t14
5
0: fix
t
estcas
e
s that
were wrongly expecting failure
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-16
Thomas Rast
stash pop: remove 'apply' options
d
uring 'drop' invocation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-10
Thomas Rast
D
o
c
u
m
e
ntation: quote braces
i
n {upstream} notati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
T
h
omas
Rast
Docum
e
nt
a
tion: mov
e
a
way
m
isplaced 'push --upstrea
m
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
T
homa
s
Rast
Documen
t
ation: add missing ::
i
n config
.
tx
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-22
T
h
o
mas Rast
D
ocume
n
tation: improve descriptio
n
o
f
--
g
lob=pa
t
tern
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas R
a
s
t
Documentation: emphasise 'git shortlog'
in its synop
s
i
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thoma
s
R
a
st
Docume
n
t
at
i
on: show-fi
l
es
is now
c
alled git
-
ls-f
i
les
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Docu
m
entation: spell 'git cmd' wi
t
hout dash throughout
commit
|
commitdiff
|
tree
2010-01-10
Th
o
m
as Rast
Documentation: format full commands in typew
r
i
t
er fon
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thom
a
s Rast
Docu
m
e
ntation:
warn p
r
om
i
n
e
nt
l
y
ag
a
inst
merging with
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Ras
t
D
ocumenta
t
ion/git-merge: reword referen
c
es to "remote
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
bash completion: facto
r
s
u
bmodules i
n
to di
r
ty
s
ta
t
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-21
T
h
omas
R
ast
describe:
d
o not
use unannotat
e
d tag e
v
en if e
x
act
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas Rast
Document
g
i
t
-svn's
f
irst-parent rule
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Tho
m
as Rast
re
b
ase docs: clar
i
fy -
-
merg
e
and --strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-15
Thomas
Rast
D
o
c
umentati
o
n
:
clarify
'o
u
rs' merge strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thomas R
a
st
filter-b
r
anch:
n
earest
-
ancestor re
w
riting outside s
u
bdi
r
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thoma
s
Rast
filter-branch: stop spe
c
ial-casing
$fi
l
ter_subdir argument
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-28
Thomas Rast
desc
r
ibe: when
f
ailing,
t
ell the use
r
about optio
n
s
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Thomas Rast
Quote ' as
\
(aq in manpag
e
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thoma
s
Ra
s
t
stash list: drop the default limit of 10 sta
s
hes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
homas Rast
stash l
i
st: use ne
w
%g
formats ins
t
ead of sed
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas
Ra
s
t
Introd
u
c
e
new pr
e
tty
format
s
%g[
s
dD]
f
o
r reflog inf
o
rmation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
r
e
fl
o
g
-
w
a
l
k
: refactor t
h
e
branch@{num} formatting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
h
omas Ras
t
Refa
c
to
r
p
r
etty_prin
t
_co
m
mit arguments into a
s
truct
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas
Ras
t
Let --
d
ecorate show HEA
D
posi
t
i
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas
Rast
bash complet
i
on: complet
e
refs for git-grep
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
DWIM 'git stash s
a
ve -
p
'
f
or 'git stash -
p
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
Impl
e
ment 'git stash
save
--patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Th
o
mas Rast
Implem
e
n
t 'git checkout --pat
c
h
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Ras
t
Implement 'git
r
e
set
-
-patch
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thoma
s
Rast
add -p: do not attempt to coalesce mode changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
T
hom
a
s
R
ast
Add a small patch-mode t
e
sti
n
g library
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
b
u
i
ltin-a
d
d: refactor the meat of interact
i
v
e_add
(
)
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Ras
t
git-apply--interactive: Refacto
r
patch mode code
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
T
h
omas Rast
gitk: Parse a
r
b
i
trar
y
co
m
m
i
t-
i
sh in SHA1 field
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Rast
gitk:
Fix di
r
e
c
tion of symmetric difference
i
n optimized
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Rast
gitk:
New optio
n
to hide re
m
ot
e
refs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
Thomas R
a
s
t
Document 'st
a
sh
clear
'
r
ecovery via unreac
h
able
c
ommits
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Thomas R
a
st
Disable asciidoc
8
.
4
.
1+ semantics f
o
r `{plus}` and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas
R
ast
T
e
st grep --
a
n
d
/--or/--not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas R
a
s
t
Test git archive
-
-re
m
ot
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas R
a
st
Use die_errno()
i
nste
a
d of die() when checking syscalls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thoma
s
Rast
Conv
e
rt ex
i
sting
die(
.
.
.
,
str
e
rr
o
r(er
r
no)) to
die_errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Ra
s
t
Introduce die_errno() t
h
at appends
str
e
rror(e
r
rno)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Th
o
mas Ra
s
t
git-sv
n
:
let 'dcomm
i
t $rev'
w
ork on $rev inst
e
ad of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Thomas Rast
D
ocument
a
tio
n
: refer to gitwor
k
flows(7) from
tu
t
o
r
ial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
T
homas
R
ast
add -i: do n
o
t dum
p
p
a
tch during appl
i
cation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Thom
a
s Ra
s
t
Documentation: teach stas
h
/pop workf
l
ow i
n
stead o
f
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
T
homas Rast
Document
a
tion
:
teach
stash/pop
w
o
r
kf
l
o
w
instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Thomas Ra
s
t
bash
c
o
mpletion:
onl
y
show '
l
og --merg
e
'
i
f merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Tho
m
as Rast
Documentatio
n
: f
o
rm
a
t-p
a
t
c
h
--root clarifications
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
Documentation:
fi
l
ter-b
r
an
c
h
:
sh
o
w --ignore-unmatch
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Th
o
mas Rast
send-email: test --no-thread
--in-reply-
t
o combination
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Thom
a
s Rast
s
e
nd-e
m
ail: resp
e
ct in-r
e
ply-to regardless
of thre
a
ding
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas R
a
st
format-patch: support deep threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
format-patch:
thread as reply to cover
l
e
t
t
e
r even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
T
homas Rast
format-patch: track several
references
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
Tho
m
a
s
Rast
Test rev-li
s
t --pare
n
ts/--children
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Th
o
mas Rast
T
est log -
-
deco
r
a
te
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
omas Rast
T
e
st fs
c
k a bit h
a
rder
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Th
o
m
as Rast
Test
l
og --graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
h
omas Rast
Test
d
i
f
f --di
r
stat functi
o
nality
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test
t
hat
d
i
ff can read from stdi
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next