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
merge-tree: handle directory/empty conflict correctly
2013-05-07
Joh
n
Ke
e
ping
merge-tree: handle directory/em
p
ty conflict correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-28
John Keeping
merge-tree: fix ty
p
o in "both chang
e
d identically
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-04-08
John
K
eeping
merg
e
-tre
e
: don't print en
t
r
ies t
h
at m
a
tch "local"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-27
John Keeping
m
e
r
g
e
-tree: fix typo in merge
-
tree
.
c::unresol
v
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-27
C
h
ristian Helmuth
git-commit doc: describe u
s
e of multi
p
le
`-m` option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-27
Mih
a
i
Cap
o
t
ă
git-pul
l
doc: fix grammo
("con
f
licts" is plural)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-26
Dan Bornstein
Corre
c
t t
h
e docs
a
bout GIT
_
S
S
H
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-25
J
u
n
io C
H
amano
Merge bra
n
c
h 'lf/bundle-verify-list-prereqs'
i
nto mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Mer
g
e bra
n
ch '
t
k/
d
o
c
-fil
t
er-b
r
anch' into maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Jun
i
o C Ha
m
ano
M
e
r
g
e b
r
anch 'dm/ni-maxh
o
st
-
may
-
be-
m
issi
n
g' into
maint
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C Ham
a
no
M
erge
branch 'gp/describe-match-us
e
s-g
l
ob-pattern'
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Junio C Hamano
Merge
branch
'
nd/doc
-
inde
x
-format' into mai
n
t
-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Junio C Ha
m
a
no
Merge
branch 'wk/doc-pr
e
-rebase' in
t
o maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-25
Junio C
Hamano
Mer
g
e
b
ranch 'jc/
c
o
l
or-diff-doc' into maint-1
.
8
.
1
commit
|
commitdiff
|
tree
2013-03-17
Kac
p
er Kornet
t1507:
T
e
s
t
t
hat bra
n
chna
m
e@
{
upstr
e
a
m} is inter
p
ret
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-17
Kacpe
r
Ko
r
net
rev-parse: cl
a
rify documentation of $
n
ame@{upstr
e
am
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-17
Ren
é
Scharf
e
sha1_name: pass
o
bject
n
ame length
t
o di
a
gnose_invalid_s
h
a1
_
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-17
René Scharfe
M
akefile: keep LIB
_
H entries
togethe
r
and sort
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-11
Kevin Bracey
g
it
.
c: make usage mat
c
h manual page
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-10
K
evin
Bracey
T
ranslate
git_more_i
n
fo
_
s
t
ring consistently
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-09
Antoi
n
e
P
e
lisse
p
erf: updat
e
docu
m
e
n
tation of GI
T
_PERF_REPEAT
_
COUNT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-08
Lukas Fle
i
s
c
her
bundl
e
: Add colons to
l
ist headin
g
s in "verify"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Lukas
F
leis
c
her
bu
n
d
l
e
:
F
ix "ver
i
f
y
" output if history is com
p
lete
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-07
Junio C Hamano
Merge bran
c
h 'mh/maint-ceil-absol
u
t
e'
i
nto main
t
commit
|
commitdiff
|
tree
2013-03-07
Fre
d
rik
Gustafsson
gitweb/README: r
e
mo
v
e reference t
o
git
.
k
ernel
.
org
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Junio
C Hamano
Gi
t
1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Tho
m
a
s Rast
Make !pattern in
.
gitat
t
ributes non-fatal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-03-01
Junio C
H
amano
Merge bran
c
h 'wk/user-manual' into maint
commit
|
commitdiff
|
tree
2013-03-01
Andrew
W
ong
Do
c
umentat
i
on
/
g
itho
o
ks: Fix li
n
kgit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Junio C
H
amano
Update draft release notes to
1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-27
Junio C Ham
a
n
o
Merge branch 'ef/non-ascii-parse-options-error-di
a
g
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio C
H
amano
Merge
branch 'wk/man-deny-curr
e
nt-branch-
i
s-
d
ef
a
u
l
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-27
Junio C Hamano
Merge br
a
nch 'jn/less-
r
e
co
n
fig
u
r
e'
i
n
to maint
commit
|
commitdiff
|
tree
2013-02-27
Bra
d
K
in
g
Do
c
umentatio
n
/sub
m
odule: Ad
d
--for
c
e
to
u
p
date synopsis
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-26
Tadeusz Andrz
e
j
.
.
.
Doc
u
mentation:
f
ilter-bra
n
ch env-filter example
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-26
Ta
d
eusz
Andrze
j
.
.
.
git-filter-branch
.
txt: clarif
y
i
d
e
n
t vari
a
b
l
e
s usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
D
a
vid Michael
gi
t
-compat-util
.
h: Provide missing netdb
.
h definition
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Prepare for 1
.
8
.
1
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
M
e
rge branch 'jc/m
e
nt
i
on-tracking-for-pull-
d
efault
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio
C Hamano
Merge
branch 'mm/conf
i
g-intro-in-git-
d
oc' i
n
to
m
a
in
t
commit
|
commitdiff
|
tree
2013-02-25
Junio C Ha
m
a
no
Merge branc
h
'da/p4mer
g
e-mk
t
e
m
p-
f
ix' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C
Hamano
M
e
r
g
e
b
r
anch 'bw/get-tz-off
s
et-perl' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2013-02-25
Ju
n
io C Hamano
Merge br
a
n
c
h 'al/
m
e
r
getool-printf
-
fix' into m
a
int
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
M
e
r
g
e branch 'jx
/
u
tf8-printf-wid
t
h' into maint
commit
|
commitdiff
|
tree
2013-02-25
Jun
i
o
C Hamano
Merge
branch
'mg/
b
isec
t
-d
o
c' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Hamano
Me
r
g
e
bran
c
h 'sp/smart-
h
ttp-content-typ
e
-chec
k
' int
o
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
H
a
m
ano
M
e
rge branch 'jc
/
comb
i
ne-diff-many-parents' into
m
aint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
H
a
ma
n
o
Merge branch '
j
k
/
apply-similaritl
y
-parsing' into maint
commit
|
commitdiff
|
tree
2013-02-25
J
u
nio C Hamano
M
erge branch 'jk/rem
o
te-helpers-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
m
a
no
Merg
e
branch 'ab
/
gitweb-use-sam
e
-
sc
h
eme' into maint
commit
|
commitdiff
|
tree
2013-02-25
Junio C Haman
o
M
e
rge branch '
z
k
/
c
l
ean-
r
epo
r
t-failure' i
n
to maint
commit
|
commitdiff
|
tree
2013-02-25
Junio
C
Hamano
Mer
g
e branch '
n
d/clone-no
-
separate-gi
t
-d
i
r-with-bare
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Junio C H
a
mano
Me
r
ge branch 'da
/
p4me
r
ge-mktemp' into main
t
commit
|
commitdiff
|
tree
2013-02-25
Greg P
r
ice
Documentat
i
on
:
"ad
v
ice
"
is uncountable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-25
Greg
P
rice
describe:
Document --match patte
r
n f
o
rmat
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-24
W
.
Trevo
r
King
Documentati
o
n/gi
t
hooks: Explain pre
-
rebase paramete
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-23
Nguyễn Thái Ngọ
c
Duy
up
d
a
t
e
-ind
e
x
:
list supported
i
dx ver
s
i
o
n
s
and their
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-23
J
u
n
i
o
C Ham
a
no
di
f
f-option
s
: unconfuse de
s
cripti
o
n of --co
l
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
Nguyễn Thái Ngọc
Duy
r
e
a
d-cach
e
.
c: us
e
INDEX_FORMAT_
{
LB,UB} in verify_hdr()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
Nguy
ễ
n Thái Ngọc Duy
index-forma
t
.
txt: mention of v4 is mi
s
sing in some
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-22
Micha
e
l
H
a
gger
t
y
P
r
ovide
a
mec
h
anis
m
to tur
n
off symlin
k
resolution
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-21
Jeff King
Makefil
e
:
a
v
oid infinite
l
oop on c
o
nfigure
.
ac change
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Junio C
H
amano
G
it
1
.
8
.
1
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Junio C Ham
a
n
o
Merge bra
n
ch 'ob/imap-sen
d
-ssl-v
e
r
i
fy'
into
m
ain
t
commit
|
commitdiff
|
tree
2013-02-20
Oswald
B
uddenhagen
imap-send: support subjectAltName as we
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-20
Oswald
Bud
d
enhagen
i
map-send
:
the subject of
S
SL certificate must m
a
tch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
T
r
evor
K
ing
us
e
r-manual:
F
l
esh
out uncommitted changes an
d
submo
d
ule
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
u
s
er-manual: U
s
e
r
equ
e
st
-
pull to gener
a
te "plea
s
e
pul
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
W
.
Trevor King
user-m
a
nual
:
Reorgani
z
e the r
e
roll
s
ections,
adding
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-19
Junio C
H
amano
imap-send: move
#if
d
ef ar
o
und
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
Ju
n
io C
Hamano
user-man
u
al: typofix (ofthe->of the)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Tr
e
vor King
u
s
er-manual: use -
o
late
s
t
.
ta
r
.
gz to creat
e
a gzi
p
ped
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trev
o
r
K
ing
u
s
e
r-manual:
use
'git
config --global user
.
*
'
for setu
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Tr
e
vor Ki
n
g
user-ma
n
ual: ment
i
on 'git remote add' for remot
e
branch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor Kin
g
user
-
manual:
g
i
v
e 'gi
t
push -
f
' as
a
n alternative to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-18
W
.
Trevor Kin
g
user-manual: use
'remote ad
d
' to setup push URLs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-15
Matthieu Moy
git
.
t
xt: upda
t
e description o
f
the configuration mechanism
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-14
W
.
T
revor King
u
s
e
r
-manual: Upd
a
te for recei
v
e
.
deny
C
urrent
B
ranch=refuse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-12
Matthieu Moy
Repl
a
ce filepattern with pathsp
e
c fo
r
con
s
istency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
E
r
ik Faye-L
u
n
d
parse-
o
ptio
n
s
: report
u
nco
r
ru
p
ted mu
l
ti-
b
yte options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
Jian
g
Xi
n
Add ut
f
8_
f
prin
t
f
helper that returns
c
orrect number
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
M
ichael J Gruber
git-b
i
s
e
ct
.
txt: c
l
arify that
reset quits bisect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor King
user
-
manual: Rew
r
ite git-gc se
c
tion
for au
t
omatic packing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Trevor King
user-manual: Fix 'you - Git'
->
'you--Git' typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-11
W
.
Tr
e
v
or King
user-
m
a
n
u
a
l: Fix 'h
t
tp
'
-
>
'HTTP' typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
W
.
Tre
v
or Ki
n
g
user-man
u
al:
F
i
x 'both
:
so'
-
> 'b
o
t
h; so'
typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
p4
m
erge
:
fix printf
u
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-10
David Aguilar
difftool--help
e
r: f
i
x prin
t
f usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben
Walton
cvsim
p
o
rt: format c
o
mmit timestamp
o
urselves witho
u
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben
W
a
l
ton
perl/G
i
t
.
pm: f
i
x get_tz_off
s
et
t
o properly hand
l
e DST
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-09
Ben Walton
Mo
v
e Gi
t
:
:
SVN
:
:get_tz to G
i
t
:
:get
_
tz_offset
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-08
Asheesh Laroia
gi
t
-mergetool: print fil
e
name when
it c
o
ntains %
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C H
a
mano
Git
1
.
8
.
1
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge
b
ranc
h
'mz/pick-unborn'
into maint
commit
|
commitdiff
|
tree
2013-02-07
J
u
n
io C Hamano
Merge branch 'nd/fix-p
e
rf-parameters-in-tests' into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge branch 'jc/do-
n
o
t
-let-rand
o
m-file-i
n
ter
f
ere-with
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Juni
o
C Haman
o
Merg
e
b
ranch 'ft/tra
n
spo
r
t-report-seg
v
' into
m
aint
commit
|
commitdiff
|
tree
2013-02-07
Junio C Hamano
Merge
b
ra
n
ch 'sb/gpg-plug-fd-leak' into
ma
i
nt
commit
|
commitdiff
|
tree
2013-02-07
Jun
i
o C
Haman
o
Merge bra
n
ch 'jc/f
a
ke-anc
e
s
t
or-wi
t
h
-
non-blo
b
s'
into
.
.
.
commit
|
commitdiff
|
tree
2013-02-07
Junio
C
Hamano
Merge br
a
nch 'jn/auto-de
p
end-wo
r
kar
o
u
n
d-bugg
y
-cc
a
che
.
.
.
commit
|
commitdiff
|
tree
next