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
t6036: add a failed conflict detection case with symlink add/add
2018-07-03
E
l
i
j
ah Newren
t6036: add a fai
l
ed co
n
flict
d
etectio
n
c
a
se with symlink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
E
l
i
ja
h
Newre
n
t6036: add a f
a
iled con
f
lict detection cas
e
with symlink
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Jun
i
o C H
a
mano
Second b
a
tch for 2
.
1
9
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge branch 'sb/fix-fetching-m
o
ved
-
s
u
bmodules'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
Me
r
g
e branc
h
'
tz/cred-
n
etrc-cleanup'
commit
|
commitdiff
|
tree
2018-06-28
J
un
i
o C Ha
m
ano
Merge branch 'jc/clean-after-sanity-tests'
commit
|
commitdiff
|
tree
2018-06-28
Junio
C Haman
o
Merge branch
'nd/c
o
m
pletion-negation
'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
M
erge branch
'pw/
a
dd-p-recount'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
H
amano
Merge br
a
nch
'
jk/fetch-
a
l
l
-peeled-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Ham
a
n
o
Merge
b
ranch 'ms/send-pack-hon
o
r-config
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
nio
C Hamano
Merge bra
n
ch 'jh/partial-clo
n
e'
commit
|
commitdiff
|
tree
2018-06-28
J
u
n
i
o C Hamano
Merge branch 's
g
/gpg-tests-
f
ix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Haman
o
Merge branch 'as/safecrlf-quiet-fix'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
M
e
rge branch 'ab/re
f
s
p
ec-init-fix'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C
Ha
m
an
o
First ba
t
c
h
for
2
.
19 cycl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C
Hamano
Me
r
ge branch 'sb/
p
lu
g
-mi
s
c-le
a
ks'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge
b
ran
c
h 'cc/tests-
w
it
h
out-
a
ssuming-re
f
-files-b
a
cken
d
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch
'sg/update-ref
-
s
t
d
in-clea
n
u
p'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Ham
a
n
o
Merg
e
b
r
an
c
h 'nd/reject-empty-shal
l
ow-request'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C H
a
m
a
no
Merge branch
'ls
/
complete-remote-update-names'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Merge branch 'ag/r
e
base-p'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ham
a
no
Merge branch
'
nd/co
m
plete-con
f
ig-vars'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C
Hamano
Merge branch 'sb/object-s
t
ore
-
a
l
l
oc'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
Hamano
Merge branc
h
'jk/show-inde
x
'
commit
|
commitdiff
|
tree
2018-06-25
J
unio C Hamano
Merge
branch
'
en/m
e
rge-recursiv
e
-tests'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C Ham
a
no
M
erge branch 'nd/diff-apply-i
t
a'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hama
n
o
Merge
b
ranch 'ds/com
m
it-graph-lockf
i
le-fix'
commit
|
commitdiff
|
tree
2018-06-25
J
u
nio C Ha
m
ano
Merge
b
ranch 'nd
/
commit-util-to-s
l
ab'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o
C Hamano
Mer
g
e branch
'pc/submo
d
ul
e
-helper-foreach'
commit
|
commitdiff
|
tree
2018-06-25
J
u
nio
C Ham
a
n
o
Prepare to
s
tar
t
2
.
19 cyc
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-25
Stefan
Beller
sequencer
.
c:
p
l
u
g
me
m
lea
k
in git_sequencer_config
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-21
Junio C
H
a
m
ano
Git 2
.
18
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Ju
n
i
o C Hama
n
o
M
e
rge
b
ran
c
h 'en/rename-dire
c
t
o
ry-detection-reboot'
commit
|
commitdiff
|
tree
2018-06-19
Junio C
H
aman
o
Merg
e
tag 'l10n-2
.
18
.
0-rnd3
.
1' of git://g
i
thu
b
.
co
m
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
Juni
o
C Ha
m
ano
Merge
bra
n
ch 'cf/submodule-pr
o
gr
e
ss-di
s
sociat
e
'
commit
|
commitdiff
|
tree
2018-06-19
Juni
o
C
Hamano
Merge
branch
'js/r
e
b
a
se-i-root
-
fix
'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Beller
t7400: e
n
capsulate setup code in test_expect_s
u
ccess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Todd Z
u
l
l
i
n
ger
t3
4
0
4:
c
h
ec
k
root co
m
m
i
t in 're
b
ase -i
--root reword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-19
Kar
t
h
i
key
a
n
Singaravelan
doc:
f
ix typ
o
s in documentatio
n
and release
n
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullinger
git
-
credential
-
netrc: make "al
l
" defaul
t
ta
r
g
e
t of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jun
i
o C Ham
a
n
o
Alm
o
st 2
.
1
8 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Merge branch 'es/mak
e
-no-icon
v
'
commit
|
commitdiff
|
tree
2018-06-18
J
uni
o
C Haman
o
Merg
e
branc
h
'sg/t74
0
6-chai
n
-
f
ix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Merge
b
ranch
'
ks/branch-set-upstr
e
am'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io
C Haman
o
Merge branch 'j
s
/rebase-i
-
root-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C
H
a
m
ano
Merge bran
c
h 'jk/ewah-bounds-c
h
eck'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Merge
t
a
g
'l10n
-
2
.
18
.
0-rnd3' of git://
g
ithub
.
com/
g
it
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
Hama
n
o
A bunch of
micro
-
fi
x
es before going 2
.
18 final
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Ham
a
no
M
e
rge
branc
h
'sb/bl
a
me-c
o
l
or'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
M
e
r
g
e
br
a
nch 'mw/doc
-
m
erge-
e
numfix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Me
r
ge branch
'
e
n/rena
m
e-directory-detection'
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C H
a
mano
Merg
e
b
r
anch 'r
d
/
doc-remot
e
-
track
i
ng-with-h
y
phen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hama
n
o
Merge branch
'
jl/zlib-
r
estore-nu
l
-
termina
t
ion'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Haman
o
M
e
rge bran
c
h
'ab/cred-netrc-no-autodie'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ha
m
ano
Merge branch 'k
m
/doc
-
workflows-typofi
x
'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Me
r
g
e
branch 'ld/gi
t
-
p4-updates'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge br
a
nch 'r
d
/diff-options
-
typofix'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C
H
amano
Merge bran
c
h
'
r
d
/comment-t
y
pofix-in-sha1-file'
commit
|
commitdiff
|
tree
2018-06-18
René Schar
f
e
m
erge-recurs
i
ve: u
s
e xstrdu
p
()
i
nst
e
ad o
f
fixed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZE
D
ER
Gábor
Rel
N
otes 2
.
18: minor
f
ix to e
n
try about dynamically
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER Gábor
t7406-
s
ubmodule-
u
pdate: fix broken &&-chains
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Joha
n
n
e
s S
c
h
inde
l
in
re
b
ase --roo
t
: fix
a
m
e
nding roo
t
comm
i
t m
e
ssages
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
u
l
li
n
ger
r
e
bas
e
--root: demonstrat
e
a bu
g
while amending r
o
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
J
e
ff K
i
ng
ewah: adjust call
e
rs of ewa
h
_read_mmap()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Jeff K
i
ng
e
wah_read_mmap:
b
ou
n
ds-
c
heck mm
a
p reads
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic S
i
v
ara
a
m
t3200: cl
a
ri
f
y
d
escription of --
s
et
-
ups
t
ream test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
L
u
i
s
Marsano
g
it-credential-netrc: f
i
x exit st
a
tus
wh
e
n
tests fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
L
u
is Marsan
o
g
i
t-credentia
l
-netrc: use in-tree Git
.
pm for tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zullinger
git-cr
e
d
e
ntial-net
r
c
:
minor whitespace cle
a
nup in
t
est
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Eric Sunshine
Makefile: make NO
_
ICONV really me
a
n
"n
o
iconv"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-15
Junio C
H
a
mano
tests: clean after SANITY tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
St
e
fan Beller
t552
6
: t
e
s
t
recursive submodu
l
es wh
e
n fetching moved
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
S
tefan B
e
ller
sub
m
od
u
le: fix NUL
L
correct
n
ess
i
n renamed
broken sub
m
odules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
Meng-Su
n
g Wu
doc:
u
pdate the o
r
der of the s
y
ntax `
g
it merge
--contin
u
e`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
R
e
né Scharfe
bla
m
e: release str
i
ng_list
a
fter
us
e
in parse_color_fields()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
merge-
r
ecursive: use
x
s
trdup() instead of fixed buffer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Git 2
.
1
8
-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Merge bran
c
h
'j
k
/ind
e
x-pa
c
k-maint'
commit
|
commitdiff
|
tree
2018-06-13
J
u
nio
C Hamano
Merge branch 'sg
/
com
p
letion
-
zsh-work
a
round'
commit
|
commitdiff
|
tree
2018-06-13
Junio C Hamano
Mer
g
e
branch '
s
b/su
b
module-merge-in-me
r
ge-recursive
'
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o
C Ha
m
a
no
Merge bra
n
ch
'
jk/submodule-fsck-loose-fixup'
commit
|
commitdiff
|
tree
2018-06-13
K
ir
i
ll Sme
l
kov
f
etch-pack: tes
t
explicitly that --al
l
c
an fet
c
h tag
.
.
.
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Jeremy
L
int
o
n
packfile: corre
c
t zlib bu
f
fer handling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Elijah Newren
RelNotes 2
.
1
8: cla
r
ify where d
i
rectory r
e
n
ame
d
et
e
ction
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Ro
b
ert P
.
J
.
Day
Use hyphenated "re
m
ot
e
-trac
k
ing branc
h
" (d
o
cs and c
o
mments)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-13
Æv
a
r Arnfjörð Bj
a
r
m
ason
git
-
credenti
a
l-netrc: rem
o
ve use of
"auto
d
ie"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-
p
4: auto-size the bloc
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke
Diamand
git-p4: narr
o
w the s
c
ope
o
f
exceptions caught w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
g
i
t-p4: raise ex
c
eptions from p
4
CmdLi
s
t base
d
on e
r
ro
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
L
u
ke
D
iaman
d
g
it-p4: b
e
t
t
er error repo
r
t
i
ng when p4
f
ails
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diaman
d
g
it
-
p4: add opt
i
on to disable syncing of
p
4
/master
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e Diamand
git-p4: disabl
e
-rebase: allow sett
i
ng this via configuration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Roma
i
n Merl
a
nd
git-p4
:
add o
p
tions
-
-commit
and --disable-
r
e
base
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Masaya Suzuk
i
builtin/send-pack: po
p
ulat
e
t
h
e default
c
o
nfig
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
Jonathan Tan
list-o
b
jects: check if filte
r
i
s NULL b
e
f
o
re using
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
K
y
le Meyer
gitworkflows: f
i
x
grammar
i
n 'Merge upwards' rule
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-12
S
ZE
D
E
R
G
á
bor
comple
t
ion: c
o
rrect
z
s
h
d
e
t
e
ction
w
h
e
n run
from
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Junio C Hamano
index-pack: correct instal
l
_packed_gi
t
() args
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Robert P
.
J
.
Day
diff-opti
o
n
s
.
txt:
f
ix
minor typos, font incon
s
iste
n
cies
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-06-11
Jeff King
fetch-pack: don't
tr
y
to fet
c
h peel
v
alu
e
s
with --all
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next