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
.gitattributes: add conflict-marker-size for relevant files
2018-08-29
Th
o
m
a
s Gummerer
.
gitat
t
ribut
e
s:
a
dd con
f
lict-marker-size for relevant
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-21
J
u
n
io C Hamano
Git 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Junio
C
Hamano
Merge branch 'en/
r
enam
e
-directory-detection-reboot'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
M
e
rge tag 'l10n-2
.
18
.
0-rnd3
.
1' of g
i
t://g
i
t
h
ub
.
c
o
m
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
M
e
r
g
e branc
h
'cf/submodule-progre
s
s-dissociate'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
Merge
b
ranch '
j
s/r
e
bas
e
-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t7400: e
n
c
a
p
s
ul
a
te setup code in tes
t
_
e
x
p
ect_
s
uccess
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
To
d
d
Z
ullinger
t3404: check ro
o
t commit in 'rebase -
i
--root reword
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Karthikeyan Si
n
g
aravel
a
n
doc:
f
ix typos
in documentation and re
l
e
ase notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hama
n
o
Alm
o
st 2
.
18
f
inal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch
'
es/make-no
-
iconv'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
Merge br
a
nch 'sg/t7406-ch
a
in-f
i
x'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
M
e
rge branc
h
'ks/br
a
nch-set-upstr
e
am'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
Hamano
Mer
g
e bran
c
h 'j
s
/rebase-i-roo
t
-f
i
x'
commit
|
commitdiff
|
tree
2018-06-18
J
uni
o
C Ha
m
ano
Merge branch 'jk/ewah-bounds-ch
e
ck'
commit
|
commitdiff
|
tree
2018-06-18
J
u
n
i
o C Hamano
Merge t
a
g
'l10n-2
.
18
.
0-rnd3' of git
:
//github
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
aman
o
A bunch of micro
-
fixes be
f
ore
g
oing 2
.
18
fina
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o
C
H
a
man
o
Merge bra
n
ch
'sb
/
b
lame-color'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
ma
n
o
Merge branch 'mw
/
d
o
c
-
merge-
e
numfix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Ham
a
no
M
e
rge branch 'e
n
/rename-
d
i
r
ectory
-
detection'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
m
ano
M
e
r
g
e branch
'rd
/
doc-remote-
t
racki
n
g-with-hyphen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge br
a
nch 'jl/
z
lib-r
e
store-nul-ter
m
in
a
tion'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Ha
m
ano
Mer
g
e bra
n
ch 'ab/c
r
ed-netrc-no-autodie
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge
b
ranch 'k
m
/doc-workflows-typofix'
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Hama
n
o
Me
r
ge
br
a
nch
'
ld/git-p4-u
p
dates'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
i
o C
Haman
o
M
e
rge
b
ranch 'rd/diff-options-t
y
pofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ha
m
ano
Merge b
r
anch 'rd/c
o
mment-typofix-in-s
h
a1-
f
ile
'
commit
|
commitdiff
|
tree
2018-06-18
René Scharfe
merge-recu
r
sive: us
e
x
s
tr
d
up()
instead
o
f fixed
b
u
f
fer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
RelNotes 2
.
18: minor fix to entry ab
o
ut dynami
c
ally
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
S
Z
EDER Gáb
o
r
t7406-submodule-u
p
date:
fix broken
&
&
-
c
hains
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jo
h
annes Schindelin
rebase
--root: fix amendi
n
g root comm
i
t messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zu
l
ling
e
r
rebase
-
-root: demonstrate a
bug wh
i
le amending
root
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ew
a
h: adjust
c
allers of ewah_r
e
ad_mmap()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jef
f
King
e
w
ah_
r
ea
d
_
mmap: bound
s
-
check
m
map reads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Ka
a
r
t
ic
S
ivaraam
t3200:
c
lar
i
fy description of -
-
set-upst
r
eam tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Eric Sun
s
hine
Makef
i
l
e
:
make
NO_IC
O
NV
really
mean "no ico
n
v"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Meng-
S
ung Wu
doc: up
d
ate the order of th
e
s
y
n
ta
x
`git merge -
-
contin
u
e`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René Sch
a
rfe
blame
:
release string_list after
use in parse_color_fields()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René Scharf
e
merge-
r
ec
u
rs
i
ve: use xstrdup() instead of fixed buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
J
unio C Hamano
Gi
t
2
.
18-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Junio
C
Haman
o
Mer
g
e branch 'jk
/
index-pack-main
t
'
commit
|
commitdiff
|
tree
2018-06-13
Ju
n
io C Ha
m
ano
M
erge
b
ranch
'sg/
c
o
m
pletion-zsh-workaround'
commit
|
commitdiff
|
tree
2018-06-13
J
u
ni
o
C Ha
m
ano
Merge b
r
anch 'sb/
s
ubmodule-merge-in-merge-recursive'
commit
|
commitdiff
|
tree
2018-06-13
Ju
n
io C Ham
a
no
Merge br
a
nch
'jk/submodul
e
-fsck-
l
oose-fixup
'
commit
|
commitdiff
|
tree
2018-06-13
Jeremy Linton
packfile: correct z
l
i
b
b
u
ffe
r
handlin
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
E
l
i
j
ah
Newr
e
n
RelNotes 2
.
18:
c
la
r
ify where di
r
ectory rename
de
t
ec
t
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
R
obert P
.
J
.
D
a
y
Use h
y
phenated "remote-tr
a
c
king bran
c
h" (d
o
cs and comme
n
ts)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Æva
r
Arnfjörð Bjarm
a
s
o
n
git-credential-netrc: remove use of "autodie"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
u
ke Diamand
git-p4: auto-siz
e
the block
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
mand
git-
p
4: narrow the scope of exceptions caug
h
t when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke
D
iamand
git-p4:
r
ais
e
e
x
cept
i
ons from p4
C
md
L
ist based on error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
L
uke Di
a
mand
git-p4: bette
r
e
rror
rep
o
rting when p
4
fails
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e Di
a
mand
git
-
p
4: add option to disable syncing o
f
p4/master
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke
D
iam
a
n
d
git-p4: disa
b
le-rebase:
a
llow
se
t
ting t
h
is via con
f
igur
a
tio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Romain Merland
git-p4:
add optio
n
s --commit and --d
i
sable-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
K
y
le Mey
e
r
gitwor
k
flo
w
s:
f
ix gramma
r
i
n 'Merge
u
pwards' ru
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
SZEDER Gábor
co
m
p
letion: c
o
rrec
t
z
s
h detec
t
ion when run
f
r
o
m
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Ju
n
io C H
a
mano
index-pack:
c
orrec
t
install_p
a
cked_git() args
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Robert P
.
J
.
Day
diff
-
o
p
tions
.
txt: fix
minor typos, fo
n
t
inconsistencies
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
L
e
if Middel
s
chulte
merge-submodule: redu
c
e ou
t
put ver
b
osity
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Jeff
K
i
ng
fsck: avoid looking
a
t
N
U
L
L
blob->object
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Jeff King
t7415: don't bot
h
e
r
c
reating commit for sy
m
link tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
J
unio C Hamano
RelNotes 2
.
18:
t
ypofixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-04
Junio C Hamano
Git 2
.
18-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-04
Junio C
H
aman
o
M
e
rge
bra
n
ch 'bc/t3430-fixup'
commit
|
commitdiff
|
tree
2018-06-04
J
unio
C Ham
a
no
Merge
branch '
b
w/refsp
e
c
-api
'
commit
|
commitdiff
|
tree
2018-06-04
Junio
C
H
a
m
ano
M
e
rge bra
n
ch 'tg/doc-sec
-
list'
commit
|
commitdiff
|
tree
2018-06-04
J
unio C Ha
m
an
o
Mer
g
e branc
h
'r
d
/p4-
d
oc-markup-env'
commit
|
commitdiff
|
tree
2018-06-04
Junio C H
a
man
o
Merge branch 'nd/remote-update-doc'
commit
|
commitdiff
|
tree
2018-06-04
J
u
nio C Ha
m
ano
Merge branch 'jt/submodule-pull-recurse-re
b
ase'
commit
|
commitdiff
|
tree
2018-06-04
Duy Nguyen
remote:
d
oc typofix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-04
Robe
r
t P
.
J
.
Day
s
ha1-file
.
c: c
o
r
rect $GITDIR
t
o $G
I
T
_DIR in a com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-04
brian m
.
car
l
son
t3430: test cl
e
an-
u
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
A bit mo
r
e topics before -r
c
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Juni
o
C Hamano
Merge branch 'bw/ref-prefix-for
-
confi
g
ured-refspec'
commit
|
commitdiff
|
tree
2018-06-01
Jon
a
t
h
an Niede
r
f
e
t
ch: do not pass ref-pre
f
i
xes for fetch by exact
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Junio
C
H
amano
Merge br
a
n
c
h 'cc/tests
-
wi
t
hout-assu
m
ing-ref-files-backen
d
'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Mer
g
e
branch 'rd/
i
nit-typo'
commit
|
commitdiff
|
tree
2018-06-01
Junio C
Hamano
Merge
branch 'js/rebase-rec
r
ea
t
e-m
e
rge'
commit
|
commitdiff
|
tree
2018-06-01
J
unio C Hamano
Me
r
ge bra
n
c
h '
r
d/tag-doc-lightweigh
t
'
commit
|
commitdiff
|
tree
2018-06-01
J
u
nio
C
H
amano
Merge branch
'
rd/doc-options-
p
laceholder'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Merge b
r
anch 'en
/
rev
-
pa
r
s
e
-in
v
a
l
id-range'
commit
|
commitdiff
|
tree
2018-06-01
Ju
n
io
C Hamano
Merg
e
branch 'ld/p
4
-
unshelve'
commit
|
commitdiff
|
tree
2018-06-01
Juni
o
C Haman
o
Merge branch 'nd/use-opt-i
n
t
-set-f'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Mer
g
e
b
ran
c
h 'pa/import-tars-long-n
a
mes'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Me
r
g
e bra
n
ch '
n
d/command-list'
commit
|
commitdiff
|
tree
2018-06-01
Jeff King
index-pa
c
k:
h
andle --stri
c
t ch
e
ck
s
o
f n
o
n-repo
p
acks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Jef
f
K
i
ng
prepare
_
commit
_
graft: treat non-repositor
y
as a no
o
p
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Junio C Ham
a
no
refspec
-
api
:
a
v
oid u
n
init
i
alized field i
n
ref
s
pec it
e
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Robert P
.
J
.
D
a
y
p4
.
txt: Use backquotes for variable nam
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
D
uy Ng
u
y
en
re
m
ot
e
.
tx
t
:
u
p
da
t
e documentation for '
u
pdate
'
command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Newren
Re
l
Notes:
re
m
ove duplic
a
te
release note
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Thomas
Gummere
r
note git-se
c
u
rity@googlegroup
s
.
com in more places
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-01
Thomas G
u
mmerer
S
u
bmittingPa
t
che
s
: replace
num
b
ered a
t
t
ributes with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-30
Junio C
H
amano
Git 2
.
1
8
-rc0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-05-30
Junio C Hamano
M
e
rge branch 'bw/
r
emote-curl-compressed-responses'
commit
|
commitdiff
|
tree
2018-05-30
Junio C Hamano
M
e
r
g
e branc
h
'
m
a/unpack-trees-free-msgs'
commit
|
commitdiff
|
tree
2018-05-30
Junio
C Hamano
M
e
rge bra
n
ch 'bc/hash-
i
n
dependent-tests'
commit
|
commitdiff
|
tree
2018-05-30
J
unio C Ham
a
no
M
e
rge branch 'ma/reg
e
x-no-regfree-a
f
ter-comp-fai
l
'
commit
|
commitdiff
|
tree
2018-05-30
J
unio C Hamano
Merge bran
c
h 'ma/c
o
nfig-store
-
dat
a
-
c
lea
r
'
commit
|
commitdiff
|
tree
next