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
Thomas
G
ummerer
.
gita
t
tri
b
utes: add confl
i
ct-m
a
rker-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
Junio C
Hamano
Git 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
J
u
n
i
o C Hamano
Merge
b
ranch
'e
n
/rename
-
directory-
d
etection
-
reboot
'
commit
|
commitdiff
|
tree
2018-06-19
Juni
o
C Ham
a
no
M
e
rge
t
ag
'
l10n-2
.
18
.
0-r
n
d3
.
1
'
o
f
git://github
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Junio
C
Ha
m
ano
Merge
b
r
a
nch '
c
f/submodule
-
progress-d
i
ssociate'
commit
|
commitdiff
|
tree
2018-06-19
Ju
n
io C
Hamano
M
erge branch
'js/rebase-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Bell
e
r
t7
4
00: encapsulate setup code i
n
test_expect_success
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Todd Zul
l
inger
t3404: chec
k
r
o
ot commit in 'rebas
e
-
i --root rew
o
r
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
K
ar
t
h
ikeyan Sing
a
ravelan
doc: fix typos in do
c
umen
t
atio
n
an
d
releas
e
n
o
t
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Alm
o
st 2
.
1
8 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
aman
o
Merge bran
c
h
'es/make-
n
o-ic
o
nv'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hama
n
o
Merge
br
a
n
ch 'sg/t7406-chain-fix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
Merge
branch 'ks/
b
ra
n
ch-set-upstream'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge
bra
n
ch 'js/re
b
ase-i-ro
o
t-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branc
h
'jk
/
ewah-
b
ound
s
-check'
commit
|
commitdiff
|
tree
2018-06-18
J
uni
o
C Ham
a
no
Merge tag 'l10
n
-
2
.
18
.
0-rnd3' of git://github
.
com/g
i
t
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
A bunch of m
i
cro-fixes before going 2
.
18 f
i
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Me
r
ge
b
ranch 'sb/blame-
c
olor'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Ham
a
no
Merge branch 'mw/doc
-
merge-enumfix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
r
g
e
br
a
nc
h
'en
/
rena
m
e-di
r
ect
o
r
y-detection'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hamano
Merge bra
n
ch 'rd/do
c
-remote-tracking-with-hyphen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
amano
Merge branch 'jl
/
zli
b
-resto
r
e-nul-termin
a
tion'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Mer
g
e b
r
a
n
ch 'ab/cred-
n
etrc-no-autodie'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'km/do
c
-
workflows-typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hamano
Merge branc
h
'ld/git-p4-u
p
da
t
e
s
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'r
d
/di
f
f-o
p
t
i
ons-typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
n
o
Me
r
ge
branc
h
'rd
/
comment-typofix-i
n
-sha1-file'
commit
|
commitdiff
|
tree
2018-06-18
René Scharfe
merg
e
-rec
u
rsive:
u
se
x
strdup() instead of
fixed
bu
f
fer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZED
E
R Gábor
RelNotes
2
.
18:
minor fix
t
o entry ab
o
ut dynamic
a
lly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
t7406-submodu
l
e-update: fix broken &&-chains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Johannes Schi
n
delin
rebase --r
o
ot: fix a
m
ending root
c
omm
i
t
messages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zu
l
linger
rebas
e
--ro
o
t: demonstrate a bug while amending root
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewah: adjust
callers of
e
w
ah_rea
d
_mm
a
p()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Je
f
f King
e
wa
h
_read_mmap: b
o
unds-c
h
eck mmap reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic Siva
r
aam
t3200: c
l
arify
descripti
o
n of
--set-upstream test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
E
r
ic Sunsh
i
ne
Makefile: make
N
O_ICONV really m
e
a
n
"no iconv"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Meng-Sung Wu
doc: upd
a
te the
order of the syntax
`git merge --continue`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
blame
:
relea
s
e
s
tring_list aft
e
r
use in parse_color_fields()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Sch
a
rfe
merge-
r
e
c
ursive: use x
s
trdup() instead of fixed buffe
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
J
un
i
o
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
J
u
nio C Hamano
Merge bra
n
ch 'jk/index-pack-maint'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge bra
n
ch 'sg/completion
-
z
s
h
-
wor
k
around'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge
b
ranch 'sb/subm
o
dule-mer
g
e
-in-merge-re
c
ursive
'
commit
|
commitdiff
|
tree
2018-06-13
Juni
o
C Hamano
Merge br
a
nch 'jk/submodul
e
-
f
s
c
k-loose-fixup
'
commit
|
commitdiff
|
tree
2018-06-13
Jeremy Linton
packfi
l
e
:
correct zlib buf
f
er handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
R
e
lNotes 2
.
18:
c
larify where directo
r
y rena
m
e detecti
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Rober
t
P
.
J
.
Day
Use hyp
h
enated "remo
t
e-tracking branch" (docs an
d
com
m
ent
s
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ævar
A
rnfjörð Bja
r
ma
s
on
git
-
crede
n
t
ial-netrc: remove use of
"
autodie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diaman
d
git
-
p4
:
a
ut
o
-size the block
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4: narrow the scope of
e
xceptions caught when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
u
ke Diama
n
d
git
-
p4: raise exceptions
f
rom p4CmdLi
s
t based on
e
rror
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke D
i
amand
git-p4: better error re
p
orting when p4 fails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4: add option to
disable syncing of p4/mas
t
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
g
i
t-
p
4:
di
s
able-rebase: allow setting thi
s
v
ia configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Romain Merl
a
nd
git-p4: add options -
-
commit and --disable-re
b
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Kyle M
e
yer
gitworkflows: fix g
r
ammar in 'Merge
upwards' r
u
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
SZEDER
Gábor
completion: correct zsh detec
t
ion
w
hen run
from git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Ju
n
io C Hamano
in
d
ex-pack: corre
c
t insta
l
l_packed_
g
i
t
() arg
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Robert P
.
J
.
Day
di
f
f-options
.
txt: fix minor t
y
pos, font inc
o
n
s
i
stencies
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Leif M
i
ddelschulte
m
erge-submodul
e
: reduce output
verbosity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
J
e
ff King
fsck
:
avoid loo
k
i
ng at
NUL
L
blob->object
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Jeff
Ki
n
g
t74
1
5: d
o
n't
bother cr
e
ating commit
for
s
ymlink
t
est
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Junio C Hamano
RelNote
s
2
.
18: typofixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
J
unio C Ha
m
ano
Git
2
.
18-
r
c1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
Junio C
Hamano
Merge branch '
b
c/t3430-fixup'
commit
|
commitdiff
|
tree
2018-06-04
J
u
ni
o
C Hamano
M
e
rge branch 'bw/
r
efspec-api'
commit
|
commitdiff
|
tree
2018-06-04
Junio C
H
amano
Merge
br
a
nc
h
'tg/doc-sec-list'
commit
|
commitdiff
|
tree
2018-06-04
Junio C
Haman
o
Merge
branch 'rd/p4
-
d
o
c-markup-env'
commit
|
commitdiff
|
tree
2018-06-04
Junio C Hamano
Mer
g
e b
r
anch 'nd/remote-up
d
ate-d
o
c
'
commit
|
commitdiff
|
tree
2018-06-04
Junio
C Hamano
M
e
rge bran
c
h
'
j
t
/
subm
o
d
ule-pul
l
-rec
u
rse
-
rebase'
commit
|
commitdiff
|
tree
2018-06-04
Du
y
Nguyen
remot
e
:
d
oc
t
ypofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
Robert P
.
J
.
Day
sha1-file
.
c: correct $GIT
D
IR
t
o
$GIT_D
I
R
i
n
a
co
m
m
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-04
brian m
.
carl
s
on
t
3
4
30: tes
t
clean-up
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Ju
n
io C Hamano
A bit more topics befo
r
e -rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
J
u
ni
o
C Ham
a
no
Merge
bran
c
h 'bw/re
f
-pr
e
fix-for-configu
r
e
d-
r
efspec'
commit
|
commitdiff
|
tree
2018-06-01
Jonat
h
an
N
ied
e
r
fetch:
d
o not pass ref-prefixes
f
or fetch by ex
a
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Juni
o
C Ha
m
ano
Merge
b
ranch '
c
c/tests-witho
u
t-assuming-re
f
-
f
i
les-backend'
commit
|
commitdiff
|
tree
2018-06-01
Junio C
H
amano
Merg
e
bra
n
ch '
r
d/init-ty
p
o'
commit
|
commitdiff
|
tree
2018-06-01
Junio C
H
amano
Merge
branch
'js/rebase-recreate-merg
e
'
commit
|
commitdiff
|
tree
2018-06-01
Juni
o
C Hamano
Mer
g
e
b
ra
n
ch 'r
d
/
t
ag-
d
oc
-
lightweight'
commit
|
commitdiff
|
tree
2018-06-01
Junio C
H
amano
Merge branch 'r
d
/doc-options-placeho
l
der'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
M
erge branch
'en/rev-parse-in
v
a
lid-ra
n
ge'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Merge bran
c
h 'l
d
/p4-unshelve'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Merge branch
'
nd
/
use-op
t
-int-set-f'
commit
|
commitdiff
|
tree
2018-06-01
Junio C Hamano
Merge branch 'p
a
/import-tars-long-na
m
es'
commit
|
commitdiff
|
tree
2018-06-01
Junio C
H
aman
o
Mer
g
e branch 'nd/command-list'
commit
|
commitdiff
|
tree
2018-06-01
Jeff King
index-pack:
h
a
n
dl
e
--st
r
ict chec
k
s
o
f non-
r
epo p
a
cks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Jeff King
p
r
epare_commit_g
r
aft
:
treat non-reposi
t
ory as a
n
o
op
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
J
uni
o
C Hama
n
o
refspe
c
-api:
avoid u
n
initialized fi
e
ld in refs
p
ec it
e
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Robert P
.
J
.
Day
p4
.
txt
:
Use backquotes
f
o
r
var
i
able names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Du
y
Nguyen
remote
.
txt
:
update docu
m
ent
a
tion for 'updat
e
' comman
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Elij
a
h
N
ewren
RelNote
s
:
r
emove duplic
a
te release
n
ote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas
Gumm
e
r
e
r
note
g
it-secu
r
ity@googlegro
u
ps
.
com in more plac
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-01
Thomas Gum
m
ere
r
SubmittingPatches: repl
a
ce
n
umbered attrib
u
tes with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-30
Junio C Hamano
Git 2
.
18-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-30
Junio C Hama
n
o
Merge b
r
a
n
c
h 'bw/remo
t
e-
c
url-compresse
d
-
r
es
p
onses'
commit
|
commitdiff
|
tree
2018-05-30
J
uni
o
C Hamano
Mer
g
e branch 'ma/unpack-tre
e
s-free-msgs'
commit
|
commitdiff
|
tree
2018-05-30
J
unio C Hamano
Merge branch '
b
c/hash-indepen
d
ent-test
s
'
commit
|
commitdiff
|
tree
2018-05-30
Jun
i
o C Hamano
Merge
b
ranch 'ma/regex-no-re
g
free-
a
fter-comp-
f
ail
'
commit
|
commitdiff
|
tree
2018-05-30
Junio C Ham
a
no
Merge branch 'ma
/
conf
i
g
-
sto
r
e-data-clear'
commit
|
commitdiff
|
tree
next