repo.or.cz
/
git
/
dkf.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: Add automatic conflict resolvers (ours, theirs, union)
2010-08-09
T
h
oma
s
Rast
t7003
:
fix
s
ub
d
i
r
e
c
tory-
f
ilte
r
tes
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-08-02
T
h
omas Rast
Do
c
u
mentation/rev-parse
:
quoting is r
e
q
uired w
i
th
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-27
T
h
o
mas Rast
M
ak
e
fil
e
: add c
h
eck-d
o
c
s
exception for gitrevisions
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ras
t
Fi
x
'git' wrapper
u
sage stri
n
g
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thom
a
s Ras
t
Documentation/git-pu
s
h
: Explai
n
s
t
at
u
s
out
p
ut in mor
e
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thomas
R
ast
Document receive
.
d
e
n
yDeleteCurrent
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thomas
R
ast
Cast execl*()
NULL sentinels t
o
(
c
h
a
r *)
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
On
l
y ru
n
aggregate-results over actu
a
l
counts
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-18
T
homas Rast
send-email:
a
sk about and dec
l
are 8b
i
t m
a
ils
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-13
Thomas Ra
s
t
p
a
rseopt: wrap rev-pars
e
-
-p
a
rseo
p
t
u
sag
e
for e
v
al
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-12
Thomas
R
ast
rev-li
s
t: introd
u
ce --count
op
t
ion
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-12
T
h
om
a
s Rast
l
o
g_ref_se
t
up: d
o
n't return stack-
a
l
located arr
a
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
T
homas R
a
st
check_aliased_update:
strc
p
y
(
) inste
a
d of st
r
c
at(
)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Thomas Rast
t/README
:
do
c
ume
n
t --root opti
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Thomas Rast
fast-im
p
ort: die_nicely() b
a
ck to vsn
p
rintf
(
r
everts
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-05-21
Thomas Rast
Co
m
plete
p
rototype of git_config_
f
r
o
m_para
m
et
e
rs
(
)
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-17
T
ho
m
a
s
Rast
combined diff: corre
c
t
ly han
d
le truncated file
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-14
Thomas Rast
diff: add --word-diff o
p
tion
that
g
eneralizes
--color
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-29
Thomas Rast
rebase -i: make
p
ost-r
e
write work
for 'edi
t
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
D
o
cumentation: receiv
e
.
d
en
y
Curr
e
n
tBra
n
ch defaults
to
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
gi
t
-
notes
(
1
)
:
a
dd
a s
e
ction about
t
he m
e
a
n
ing of history
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
T
homas Ras
t
no
t
es: track whether
n
otes_tr
e
es were changed at all
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
notes: add s
h
orthand -
-
ref to override GIT_NOT
E
S_REF
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Rast
comm
i
t --amend: copy notes
t
o the new commit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
Ras
t
rebase: su
p
port automatic not
e
s copying
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Th
o
m
as Rast
notes
:
implement helpers needed for
n
ote c
o
pying durin
g
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
n
o
tes: implement
'
g
it
no
t
es copy --stdin'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
re
b
ase -i:
i
n
vok
e
p
o
st-rewrite hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas
R
ast
rebase: i
n
v
oke post-re
w
r
i
te hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
commit -
-
amend:
i
n
voke post
-
rewr
i
te hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
Documentation: do
c
ume
n
t pos
t
-rewri
t
e h
o
ok
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas R
a
st
Sup
p
ort showing
notes from more t
h
an one notes tree
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
t
e
s
t
-
lib: unset GIT_
N
OTES_RE
F
to stop i
t
from influe
n
cing
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
Thomas Ra
s
t
cherry_pick
_
list: quit e
a
rly if
o
n
e
s
ide is emp
t
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
Thom
a
s
Rast
t1
4
50: f
i
x te
s
tcases tha
t
were wrongly
e
xpecting failure
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-16
Thomas
R
a
st
stash pop:
r
emove 'a
p
ply' options duri
n
g 'drop' invo
c
ation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-10
Thomas Rast
Docum
e
n
t
ati
o
n: quote braces i
n
{upstr
e
am} notation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
Thom
a
s
R
a
st
Documentation: mov
e
away m
i
spla
c
ed 'pus
h
-
-upstream
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
Th
o
mas R
a
st
Documentation:
add mi
s
sing
:
: in config
.
txt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-22
T
h
o
m
as Rast
Documentation: improve descript
i
on
o
f --glob=patter
n
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
T
homa
s
Rast
Document
a
tion: emphasise 'git shortlog' in
i
ts synopsis
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Do
c
umenta
t
ion:
s
how
-
file
s
is n
o
w called
git-l
s
-file
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Documentation: spell 'git cmd' without dash throughout
commit
|
commitdiff
|
tree
2010-01-10
Th
o
ma
s
Rast
Documenta
t
ion: f
o
rma
t
ful
l
comma
n
ds i
n
t
ypew
r
iter font
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Rast
Do
c
umentation: warn prominently against merging with
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thomas
R
ast
D
o
c
u
m
e
n
t
ation/git-merg
e
: reword re
f
erences
to "remote
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-12-31
Thoma
s
Rast
bash
com
p
le
t
ion:
f
actor submodul
e
s into dirty state
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-21
Thomas Rast
describe: do
n
o
t use
u
n
annotated ta
g
even if exact
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Tho
m
as Rast
Docu
m
ent g
i
t-sv
n
's
f
irst-pare
n
t
rule
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
T
homas
R
a
st
rebase docs: clari
f
y --merge
a
n
d --strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-15
Thomas Rast
Documentati
o
n: clari
f
y 'o
u
rs' me
r
ge strateg
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
T
homas Rast
filter-branch: nearest-ancestor rewriting
outside sub
d
ir
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thomas Rast
filter-br
a
nch: stop s
p
ec
i
al-casing $fi
l
t
er_subdir a
r
g
umen
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-28
T
h
omas R
a
st
describe
:
when
f
ailing, tell the user abou
t
options
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Tho
m
as Ra
s
t
Quote ' a
s
\(aq in m
a
np
a
ges
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
stash list: drop the default limit of 10 stashes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
T
h
omas Rast
st
a
sh list: u
s
e new %g formats
instead
o
f sed
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
Introdu
c
e new
pretty formats %g[sdD] for reflog informati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
r
eflog
-
walk:
r
efactor th
e
b
r
an
c
h
@
{num
}
forma
t
ting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
Re
f
act
o
r pretty
_
print
_
comm
i
t arguments into a struct
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Rast
L
e
t --dec
o
rate sho
w
H
EA
D
p
osition
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Rast
bash
c
ompletion: complete
r
efs for g
i
t-grep
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thom
a
s R
a
st
DWI
M
'git stash
s
ave -p
'
f
o
r 'git sta
s
h -p
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
T
h
om
a
s Rast
Imp
l
ement
'git s
t
a
s
h save --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
Impleme
n
t 'git
c
heckout
--p
a
tch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
Implemen
t
'git r
e
set
--patch
'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Ra
s
t
add -p
:
do not at
t
em
p
t to c
o
a
l
esce mode changes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
Add a small patc
h
-mode testing library
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
T
h
omas Rast
bui
l
ti
n
-add: refactor
t
h
e
meat of interact
i
ve_add()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Tho
m
as Rast
git-apply--interacti
v
e:
Re
f
actor pa
t
ch mode cod
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas
R
ast
g
i
tk: Parse arbitrary commit-ish in SHA1 field
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
T
h
omas Rast
gi
t
k
:
Fix dire
c
tion of s
y
m
metric
d
i
ff
e
rence
i
n optimized
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Rast
gitk: New option to hide r
e
mote refs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
Thomas Rast
Doc
u
ment
'
stas
h
clear' rec
o
v
ery
via unreachable commits
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Thomas Rast
Disable asciidoc 8
.
4
.
1+ semantics
for `{plus}` and
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas R
a
st
Test g
r
ep --
a
nd/--
o
r/--not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
T
h
om
a
s Rast
T
est git archi
v
e
-
-remote
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thoma
s
Rast
Use die_errno
(
) instead of die() w
h
en checki
n
g syscalls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thom
a
s Rast
Conve
r
t
exist
i
n
g
die(
.
.
.
,
str
e
rror(errno)) to die
_
errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Tho
m
a
s
Rast
Introduce die
_
errno() t
h
at appends s
t
rerror
(
errno)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas Rast
git-svn: let 'dcommi
t
$
rev' work
o
n $rev instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
Thomas Ra
s
t
Doc
u
men
t
a
t
ion: refer to git
w
orkflows(7)
from tutorial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
Thomas R
a
st
a
d
d
-
i:
do not dump
p
a
t
c
h d
u
ring application
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Th
o
mas Rast
Docum
e
n
t
ation: teach stas
h
/pop wo
r
k
flow ins
t
ead
of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
Thomas
Rast
D
o
cumentation: teach s
t
ash/pop workflow
in
s
tead
of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
T
homas R
a
s
t
bash completi
o
n: only sho
w
'log --merge' if merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Ra
s
t
Document
a
tion: f
o
rmat-patch --roo
t
cla
r
ifica
t
io
n
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
Documen
t
ation: fi
l
ter-br
a
nch: show --ignore-unmatch
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
send-email:
t
e
st --no-thread --i
n
-
r
eply-to comb
i
natio
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Thomas Rast
send-em
a
i
l
: respect
i
n-reply-to
r
egar
d
less of t
h
reading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
format-patch: support deep
t
hreading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
f
o
r
m
at-patc
h
: thread as reply
to cov
e
r letter even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
format-pa
t
ch: track several references
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas
R
ast
Test g
i
t
-
patch
-
id
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Ras
t
T
e
s
t
rev-list --
p
are
n
ts/--ch
i
ldren
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test lo
g
-
-decorate
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Tho
m
as Rast
Test
fsck a bit h
a
rde
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
T
est log
-
-graph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas R
a
st
Test di
f
f --dirstat
functionali
t
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Test
t
hat diff can rea
d
fro
m
s
t
d
in
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next