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
Thom
a
s Gummere
r
.
git
a
tt
r
ibu
t
es: add conflict-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
nio C Hamano
Git
2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Ju
n
io C Ha
m
ano
Merge branch 'en/rename-
d
irectory-detectio
n
-reboot'
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hamano
Merge tag 'l10n-2
.
18
.
0-rnd3
.
1'
o
f g
i
t
:
//g
i
t
hub
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
J
u
nio C
H
aman
o
M
e
rge branch 'cf/submod
u
le-progress-disso
c
iate
'
commit
|
commitdiff
|
tree
2018-06-19
Ju
n
io C Ha
m
an
o
Merge branc
h
'js/rebase-i
-
root
-
fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t
7
400: encapsulate setup code in
t
e
s
t_expec
t
_
s
u
cces
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
T
odd Zulling
e
r
t
3404
:
chec
k
root commit in 'rebase -i --root rewor
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Karthikeyan Singar
a
velan
doc: fix typos
i
n document
a
tio
n
a
nd releas
e
not
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C
H
a
mano
Almost 2
.
18 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
m
an
o
M
e
rge bra
n
ch 'es/make-no-iconv'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Me
r
ge branch
'sg/t7406-ch
a
in-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge
b
ranch
'
ks/branch-s
e
t-upstream'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
no
Me
r
ge br
a
n
ch
'js/reba
s
e
-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
Hamano
Merge
b
ran
c
h 'jk/ewah-bounds
-
check'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Ham
a
no
Merg
e
tag 'l10n-2
.
1
8
.
0-rnd3'
o
f gi
t
:
/
/
g
ith
u
b
.
c
om/git
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
A
b
unch of mi
c
ro-fi
x
e
s
before going 2
.
18
f
inal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
M
erg
e
branch 'sb/blame-color'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
rg
e
branch 'mw/doc
-
merge-enum
f
ix'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
Merge branch '
e
n
/
ren
a
me-directory-detectio
n
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
m
a
n
o
M
erge
b
ranch 'rd/do
c
-remo
t
e-track
i
n
g-wit
h
-hyphen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merg
e
branch 'jl/zlib-restor
e
-nul-t
e
rmin
a
tion'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Haman
o
Merge branch 'ab/cred
-
net
r
c-no
-
autodie'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C
H
amano
Merge bran
c
h 'km/d
o
c-workflow
s
-
t
ypof
i
x
'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C
Hamano
Me
r
ge bran
c
h 'ld/git-p4-up
d
ate
s
'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hama
n
o
M
e
r
g
e
b
r
an
c
h 'rd/diff-op
t
ions-typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
rge branch 'rd/comment-typ
o
fix-in-sha1-
f
ile'
commit
|
commitdiff
|
tree
2018-06-18
René
S
charfe
mer
g
e
-
r
ecursive: use
x
strdup() ins
t
ead of fixed buf
f
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER
Gá
b
or
RelNotes 2
.
18: minor fix to entry about dynamicall
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
t
7
406-submodule-update: fix brok
e
n &&-chains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Joha
n
nes Schindelin
rebas
e
--root:
f
ix amending root commi
t
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zulli
n
ger
reb
a
s
e
--root: demonst
r
ate a bug
w
hi
l
e amending root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewah: a
d
jus
t
calle
r
s of ewah_read_
m
map(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewa
h
_read_mmap: b
o
un
d
s-
c
heck mmap rea
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
K
a
art
i
c Si
v
araam
t3200:
clar
i
fy descripti
o
n
o
f --set-upstr
e
am tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Eric Sunshine
Mak
e
file:
m
ake NO_ICON
V
really mean "no i
c
o
n
v"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Men
g
-S
u
ng Wu
doc
:
up
d
at
e
th
e
order of the
s
y
n
ta
x
`gi
t
merge
-
-continue`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Sch
a
rfe
blame: release string_list af
t
er use
in pa
r
se_c
o
l
o
r_fields()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Re
n
é Schar
f
e
merge-recu
r
s
ive: us
e
xst
r
dup() instead
of
f
ixed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
J
unio C H
a
mano
Git
2
.
18-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ju
n
i
o
C
Hamano
Merge bra
n
ch 'jk/index-pack-m
a
int
'
commit
|
commitdiff
|
tree
2018-06-13
J
u
nio C Ha
m
ano
Merge branch 'sg/co
m
pletion-zsh
-
wor
k
around'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Ham
a
no
Merge
b
r
anch 'sb/submodule-merge-in-m
e
rge-recur
s
i
ve'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
M
erge bra
n
ch
'
j
k/submodule-fsck-loose-fi
x
u
p'
commit
|
commitdiff
|
tree
2018-06-13
J
e
remy Li
n
ton
pa
c
k
file
:
c
orre
c
t
zlib b
u
ffer handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
18:
c
larify wh
e
re directory rename d
e
te
c
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Rob
e
rt P
.
J
.
D
ay
U
s
e hyphena
t
e
d
"remot
e
-
tra
c
king b
r
a
n
ch" (docs and comments)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ævar Ar
n
fjör
ð
Bjarmason
git-
c
redent
i
a
l
-n
e
t
r
c: remove
u
se of "autodie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Diamand
git
-
p4: auto
-
s
i
ze the b
l
ock
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
nd
git-p4: narrow the s
c
ope of excepti
o
ns caught w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e Diaman
d
g
i
t-p4
:
raise exception
s
from p4CmdList based on err
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diama
n
d
g
i
t-p4: better
e
rror reportin
g
w
h
e
n p
4
fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diam
a
nd
git-p4: add
option to
d
isable sync
i
ng of p4/master
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luk
e
Diamand
git-p4
:
disab
l
e-rebase: allow s
e
tting thi
s
v
i
a configuratio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Romain Merland
git-
p
4:
add
options --commit and --disable-rebase
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Kyle Meyer
gitworkflows: fix gra
m
mar
i
n '
M
erg
e
upwards' rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
SZEDER Gábor
completion: correct zsh d
e
t
ection when run from
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Jun
i
o
C Hama
n
o
index-pack: correc
t
in
s
tall_packed_git() arg
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Robert P
.
J
.
Da
y
diff-options
.
txt: fix minor
typo
s
,
f
on
t
inc
o
nsis
t
enci
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Leif Middelsc
h
ulte
merge-submodule:
r
educe
o
utput verb
o
sity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Jeff King
fsck: avoid looking at NUL
L
blob-
>
o
b
ject
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Jef
f
King
t7415:
don'
t
b
other cre
a
t
in
g
c
o
m
m
it for
sym
l
ink test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Junio
C
Hamano
RelNote
s
2
.
18: typo
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
J
u
nio C
H
a
m
ano
G
i
t 2
.
18-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
Junio C
Hamano
Me
r
ge branch 'bc
/
t3430
-
fixup'
commit
|
commitdiff
|
tree
2018-06-04
J
u
nio C
Hamano
Merge branch 'bw/ref
s
pec-api'
commit
|
commitdiff
|
tree
2018-06-04
Junio C H
a
mano
Merge branch 'tg/d
o
c-
s
ec-li
s
t
'
commit
|
commitdiff
|
tree
2018-06-04
Juni
o
C Ha
m
a
n
o
M
erge b
r
a
n
ch 'rd/p4-doc-markup-e
n
v'
commit
|
commitdiff
|
tree
2018-06-04
Junio C H
a
mano
M
erge br
a
nch 'n
d
/
r
emote-update-doc'
commit
|
commitdiff
|
tree
2018-06-04
Juni
o
C H
a
m
a
no
Merge branc
h
'jt/s
u
bmod
u
l
e-pull-recu
r
se-re
b
ase'
commit
|
commitdiff
|
tree
2018-06-04
Duy Ng
u
yen
remot
e
:
doc typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
Robert P
.
J
.
Day
sha1-file
.
c: correc
t
$G
I
T
D
IR t
o
$GIT_DIR in
a
c
o
mmen
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
bria
n
m
.
c
a
rlson
t3430: t
e
s
t
cle
a
n-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
A bit more topics before -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Juni
o
C
Haman
o
Merge br
a
nc
h
'bw/ref-
p
refix-for-
c
o
n
fi
g
u
r
ed-refspec'
commit
|
commitdiff
|
tree
2018-06-01
J
onathan Nied
e
r
fetch: do not pas
s
ref-prefixes for fetc
h
by exact
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Jun
i
o C Hamano
Merge b
r
anch
'cc/tests-without-assuming-ref-files-backend
'
commit
|
commitdiff
|
tree
2018-06-01
Junio C
H
amano
Merg
e
branch
'rd/
i
nit-typo'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Merge branch '
j
s/rebase-r
e
cr
e
a
te-
m
erge'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Haman
o
Merge br
a
n
c
h
'rd/tag-doc-lightweig
h
t'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Mer
g
e b
r
anch 'rd/doc-
o
ptions-
p
laceholder'
commit
|
commitdiff
|
tree
2018-06-01
Junio C H
a
mano
Merge branch 'e
n
/
rev-parse-invalid-ra
n
g
e
'
commit
|
commitdiff
|
tree
2018-06-01
J
unio C Ham
a
no
Mer
g
e branch 'ld/
p
4-un
s
helve'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Ha
m
a
n
o
Mer
g
e b
r
anch 'nd/use-opt
-
in
t
-
s
et-f'
commit
|
commitdiff
|
tree
2018-06-01
J
u
n
io
C
Haman
o
Merge bran
c
h 'p
a
/import-t
a
rs-long-names'
commit
|
commitdiff
|
tree
2018-06-01
J
unio C H
a
mano
Me
r
ge branch 'nd/c
o
mman
d
-
l
ist'
commit
|
commitdiff
|
tree
2018-06-01
J
eff
K
ing
index-p
a
ck: handle
-
-strict c
h
ecks o
f
non-repo packs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Jeff King
prepare
_
commit_graft: treat non-repository
as a
n
o
op
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
J
unio C
H
ama
n
o
refspec
-
api: avoi
d
uni
n
itialized field in
r
efspec item
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Robert
P
.
J
.
Day
p4
.
txt: Use backquotes for variable names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Duy
N
g
u
yen
rem
o
te
.
txt: up
d
at
e
documentation fo
r
'update' command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Elijah Ne
w
ren
RelNotes:
r
emove duplica
t
e
r
e
le
a
se note
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Thoma
s
G
u
mmerer
not
e
git
-
security@
g
ooglegroups
.
com
in
m
ore
p
laces
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gummere
r
Sub
m
ittin
g
Patches: replace numbe
r
ed attributes wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-30
Jun
i
o C Hamano
G
it
2
.
1
8
-
rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-30
Junio C Hamano
Merge branch 'bw/r
e
mote-curl-compressed-response
s
'
commit
|
commitdiff
|
tree
2018-05-30
Junio
C
Hamano
M
erge b
r
anch 'ma
/
unpack-tree
s
-free-msgs'
commit
|
commitdiff
|
tree
2018-05-30
Junio
C Hamano
Mer
g
e branch
'bc/hash-independent-tests
'
commit
|
commitdiff
|
tree
2018-05-30
Junio C
Hamano
M
e
rge b
r
anch 'ma/
r
eg
e
x-n
o
-r
e
gfr
e
e
-
a
f
ter-comp-fail'
commit
|
commitdiff
|
tree
2018-05-30
Junio C Hamano
M
e
rge branch 'ma/config-sto
r
e-da
t
a-
c
l
ea
r
'
commit
|
commitdiff
|
tree
next