repo.or.cz
/
git
/
mingw.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
t7003
:
fix subdirectory-fi
l
ter test
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-08-02
Thomas Ras
t
Do
c
u
m
e
n
tation/rev-pa
r
se: quoting is requi
r
e
d
wit
h
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefile: add check-docs exception for gitrevi
s
ion
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ra
s
t
Fix 'git' wrapper usage
s
tring
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thom
a
s Rast
Doc
u
mentation/git
-
push: Explain statu
s
output in more
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thom
a
s Rast
Document receive
.
denyDelete
C
urrent
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cas
t
e
xe
c
l*() NULL
s
entinels
to
(char *)
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-07-16
Thomas Rast
O
n
ly run aggreg
a
te
-
results over
a
ctual
c
ounts
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-18
Thomas Rast
send-e
m
ail:
a
s
k
about
a
nd
d
e
c
l
are 8bit
mai
l
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-13
Thom
a
s
Rast
parseopt: wr
a
p rev-pa
r
s
e
--pa
r
seopt us
a
ge for eval
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-12
Thomas Rast
r
e
v-list: introduce --co
u
nt option
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-12
Thomas Rast
log_ref_s
e
t
u
p
: don
'
t retur
n
stack-allocat
e
d
a
rra
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Tho
m
as Rast
chec
k
_alia
s
ed_update: strcpy() ins
t
ead
o
f
strca
t
()
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Thoma
s
Rast
t/REA
D
ME: d
o
cument -
-
r
oot option
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-06-11
Th
o
mas Rast
fa
s
t-imp
o
rt:
d
ie_nicely() back to vsnprintf (r
e
vert
s
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-05-21
Thomas
Rast
Complete prototype of git_config_
f
r
om_pa
r
ameters()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-17
Tho
m
as Rast
c
ombined d
i
f
f
: correctly ha
n
dle truncated
file
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-04-14
Thomas
Rast
diff: add --word-diff option that gene
r
aliz
e
s --col
o
r
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-29
Thomas Rast
rebase -i: make post-
r
ewrite work for 'edit'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-17
T
homas
Rast
Documentation
:
receiv
e
.
den
y
C
urrentBran
c
h def
a
ul
t
s
t
o
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
git-n
o
tes(1): ad
d
a secti
o
n abo
u
t the me
a
nin
g
of
history
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
notes: track w
h
ether
notes_
t
r
ees we
r
e
c
h
anged at all
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
n
o
tes: add shor
t
hand --ref
t
o override GIT_NOTE
S
_REF
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Rast
comm
i
t --amend: copy notes t
o
the
new c
o
mmit
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
rebase
:
support automat
i
c note
s
c
o
pying
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
n
o
te
s
: impl
e
m
e
nt helpers need
e
d for no
t
e co
p
ying dur
i
n
g
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Tho
m
as Rast
no
t
e
s: implement 'g
i
t n
o
tes c
o
py --stdin'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ra
s
t
r
ebase -i: invoke pos
t
-re
w
r
i
te hoo
k
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
Ras
t
rebase: invoke post
-
rewri
t
e ho
o
k
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Rast
commit --amend: invoke
post-rewrite
h
oo
k
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thomas Ras
t
Docum
e
n
tati
o
n: d
o
cument post
-
rewrite hook
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thom
a
s Ras
t
Support s
h
owing notes from m
o
re than one notes tre
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-03-13
Thoma
s
R
ast
test-lib: unset GIT_NOTES_
R
EF to stop it from influencing
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
Thomas
Rast
che
r
ry_pi
c
k_
l
ist: quit ear
l
y if one
side
i
s empty
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-20
Thoma
s
Rast
t1450: fix testcases that were wrong
l
y expectin
g
fail
u
re
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-16
Thoma
s
Rast
stash pop:
r
emo
v
e 'apply'
o
pt
i
ons during 'drop' inv
o
cation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-02-10
Thomas
R
as
t
Do
c
umentat
i
on
:
quote braces in {upstream} no
t
ation
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
Thomas Rast
Docu
m
entation:
m
ove away misplaced 'p
u
sh --upstream
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-24
Thoma
s
Ras
t
Document
a
tion: add missing :: in
confi
g
.
txt
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-22
Thomas R
a
st
D
o
cumentation: impr
o
ve
description of
-
-glo
b
=patt
e
rn
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Doc
u
mentation: emphas
i
se 'git
s
hortl
o
g'
in its synopsis
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Thomas Rast
Documentatio
n
: s
h
ow-files is now ca
l
l
e
d git-ls
-
files
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-10
Th
o
mas Rast
D
ocu
m
entatio
n
:
spe
l
l
'
git
c
md' without dash throu
g
h
out
commit
|
commitdiff
|
tree
2010-01-10
T
homas Rast
Documen
t
ation: format full comman
d
s in
t
ypew
r
i
t
e
r fon
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thomas Ras
t
Documentation: warn prominent
l
y
a
gainst merg
i
ng wi
t
h
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2010-01-09
Thom
a
s
Rast
Documentation/
g
it-merge: reword references
t
o
"
remote
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-12-31
Thomas Rast
b
a
sh completion: factor
submodu
l
es into
d
irty state
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-21
Thoma
s
R
a
st
descr
i
b
e
: do not use unannotated
t
ag even if exact
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas
R
as
t
D
o
cu
m
ent git-s
v
n's first-parent
r
u
l
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-17
Thomas Ra
s
t
rebase docs: cla
r
ify
--merge an
d
--strategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-15
T
h
omas R
a
st
D
o
c
umen
t
ation:
clar
i
fy 'o
u
rs' merge
s
trategy
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
Thomas
R
as
t
fi
l
ter-branch: nearest-a
n
ce
s
tor rew
r
iting outside subdir
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-11-13
T
h
omas Rast
fil
t
er-branch: stop
special
-
casing $f
i
lt
e
r
_subdir
a
rgu
m
ent
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-28
Thomas Rast
describe: when failing, tell the
use
r
about options
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-22
Thom
a
s Rast
Quo
t
e
' as \(aq in manpages
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
s
tash list: dr
o
p the default limit of 10 st
a
shes
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
stash list: use new %g
f
ormats
i
nstead of
s
e
d
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas
R
ast
In
t
roduce
new p
r
etty f
o
rma
t
s %g[sdD] fo
r
reflog informati
o
n
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
re
f
log-walk: refactor th
e
bra
n
ch@{num} for
m
atting
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-20
Thomas Rast
Refactor p
r
e
tty_prin
t
_commit arguments int
o
a stru
c
t
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Thomas Ra
s
t
Let --decorate show HEAD position
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-10-12
Th
o
mas Ras
t
bas
h
c
om
p
letion: complete r
e
fs for git-grep
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Th
o
mas Rast
DWIM 'git stash save -p' for '
g
it s
t
ash -p'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas
R
a
s
t
Impl
e
ment '
g
it stash save --patch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
I
m
p
l
e
ment 'git che
c
kout --pa
t
ch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thom
a
s Ra
s
t
Implement
'
git re
s
et --p
a
tch'
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-15
Thomas Rast
add -
p
:
d
o
not attem
p
t to coale
s
c
e mode change
s
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
Add
a small p
a
tch-mod
e
testi
n
g
library
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
bui
l
tin-add:
r
e
f
actor the
m
eat o
f
interactive_add()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-14
Thomas Rast
git-apply--i
n
teractive: Refactor p
a
tch mo
d
e
c
o
d
e
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Ras
t
gitk
:
P
a
rse arbitrary
c
o
mmit-ish in S
H
A
1
f
i
e
l
d
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Tho
m
as Ras
t
gitk: Fix
direction of symmet
r
ic diffe
r
enc
e
in o
p
t
imized
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-13
Thomas Rast
gitk: New option to hide remote r
e
fs
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-08-10
Thomas Rast
Do
c
u
me
n
t 'stash cl
e
ar'
r
ecovery via unreac
h
able commits
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-07-25
Thom
a
s
Rast
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
T
ho
m
as Rast
Test
grep
-
-and/--or/--not
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Thomas Rast
Test
git archive --re
m
ote
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Th
o
mas R
a
s
t
Use
die_
e
rrn
o
(
) in
s
tead of die() when c
h
ec
k
ing syscalls
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Tho
m
as R
a
st
C
onvert existing
d
i
e(
.
.
.
,
s
trer
r
or(errno)) to die_errno()
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-27
Th
o
mas Rast
Introduce die_errn
o
(
)
that appends strerror
(
errno)
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-25
Thomas Rast
git-svn:
let 'dc
o
m
m
it
$
rev' wor
k
on $rev instead
of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-06
T
homas Ra
s
t
Documentati
o
n:
r
efer
t
o gitwo
r
kfl
o
w
s
(7) f
r
o
m
tutorial
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-06-03
Thomas Rast
add -i:
do not d
u
mp
patch d
u
ring application
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-31
Thomas Rast
Documentation: teach st
a
sh/po
p
w
orkflo
w
instead of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-05-29
Thoma
s
Rast
Documentation:
t
each
s
tas
h
/pop workflow inste
a
d of
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-30
Thomas R
a
st
bash complet
i
on: only
s
h
o
w 'log --me
r
ge' if merging
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-27
Thomas Rast
Documentation
:
format-patch
-
-root clarifications
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Tho
m
as Rast
Documentation:
fi
l
t
er-branch: show
--ignore-unmatc
h
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-12
Thomas Rast
se
n
d-email: test --no-thread --in-reply-to combination
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-03-03
Thomas Rast
s
end-emai
l
: re
s
pect in-reply
-
to regardless of threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
fo
r
mat-patc
h
:
support d
e
ep
threading
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
format-p
a
tch: thread a
s
reply to co
v
er letter even
.
.
.
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-22
Thomas Rast
f
ormat-patch: track several referen
c
es
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
T
ho
m
as Rast
Test git-patch-id
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Ras
t
Test rev-l
i
st --paren
t
s/--chi
l
dren
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Ras
t
Tes
t
log --decorate
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas
R
ast
Test fsck a bit
ha
r
d
e
r
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Te
s
t l
o
g
-
-
g
r
a
ph
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas Rast
Tes
t
d
iff --dirs
t
at
f
unctional
i
t
y
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
2009-02-20
Thomas R
a
st
Test that d
i
ff can read from stdin
Signed-off-by:
Thomas Rast
<trast@student.ethz.ch>
commit
|
commitdiff
|
tree
next