repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
t6036: add lots of detail for directory/file conflicts in recursive case
2018-07-06
Elijah N
e
w
ren
t6036:
a
dd
l
ots of de
t
a
il for
dire
c
tory/
f
ile c
o
n
flicts
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
H
a
mano
Second batch f
o
r
2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-28
Junio
C
Hamano
Merge
bra
n
ch 'sb/fix-fetching-mo
v
ed-submodule
s
'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Hamano
Merge branch 'tz/cr
e
d
-
netrc-cleanup
'
commit
|
commitdiff
|
tree
2018-06-28
J
u
n
io
C Haman
o
M
er
g
e
branch 'jc
/
clean
-
after
-
sanity-tests
'
commit
|
commitdiff
|
tree
2018-06-28
Ju
n
io C Hamano
Merg
e
branch 'nd/comp
l
e
t
ion-
n
egati
o
n'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
M
e
rge branch
'p
w
/add-p
-
r
ecoun
t
'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Ha
m
ano
Mer
g
e b
r
anch 'jk/fetch
-
all-peeled-fix'
commit
|
commitdiff
|
tree
2018-06-28
Junio C Hamano
Merge branch 'ms/send-pack-honor-config'
commit
|
commitdiff
|
tree
2018-06-28
Junio C
H
amano
M
erge branch 'jh/p
a
r
tial-clone'
commit
|
commitdiff
|
tree
2018-06-28
Ju
n
io C Ha
m
ano
Merge branc
h
'sg/gpg-t
e
sts-fix'
commit
|
commitdiff
|
tree
2018-06-28
Juni
o
C Hama
n
o
Merge branch 'as/sa
f
ecrlf-quiet-
f
i
x'
commit
|
commitdiff
|
tree
2018-06-28
J
unio C Ham
a
no
Merge branch 'ab
/
r
e
fspec-init
-
fix'
commit
|
commitdiff
|
tree
2018-06-25
Ju
n
io C
H
ama
n
o
First
batc
h
fo
r
2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ha
m
ano
Me
r
ge
branch 'sb/plu
g
-misc-lea
k
s'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Mer
g
e
branc
h
'cc/test
s
-w
i
thout-assum
i
ng-re
f
-
f
iles-backend'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
a
mano
Merge
b
ranch 'sg/u
p
date-
r
ef
-
stdin-clea
n
u
p
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C
H
amano
M
erge branc
h
'
nd
/
reject-e
m
pty-shallow-req
u
est'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge b
r
anch 'ls/c
o
mplete-remote
-
update-na
m
es'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Merge bran
c
h 'ag/rebase-p'
commit
|
commitdiff
|
tree
2018-06-25
Jun
i
o C Hamano
M
erge bra
n
ch 'nd/
c
omp
l
ete-confi
g
-vars
'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hama
n
o
Me
r
ge
branch 'sb/object-store-alloc'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Hamano
Merge branch '
j
k/show-index'
commit
|
commitdiff
|
tree
2018-06-25
Junio C Ha
m
a
no
Merge bran
c
h
'
e
n
/merge-recursi
v
e
-test
s
'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Hamano
Merge branch 'nd/
d
i
f
f-apply-
i
t
a'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
Hamano
Me
r
ge branc
h
'ds
/
commit-grap
h
-lockfile-fix'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
M
erge br
a
n
c
h '
n
d/commit-util-to-s
l
ab'
commit
|
commitdiff
|
tree
2018-06-25
Junio
C
H
a
ma
n
o
Merge branch 'p
c
/su
b
modu
l
e
-help
e
r-
f
oreach'
commit
|
commitdiff
|
tree
2018-06-25
Juni
o
C Hamano
Prepare
to start 2
.
19 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-25
Stefan
Beller
s
e
quencer
.
c:
p
lug mem leak i
n
g
i
t_se
q
u
e
ncer_confi
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-21
Jun
i
o C Hamano
Git 2
.
18
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
Junio C Hama
n
o
M
e
rge bra
n
ch 'en/rename
-
director
y
-detec
t
io
n
-reboot'
commit
|
commitdiff
|
tree
2018-06-19
J
u
nio C
Ham
a
no
Merge tag
'
l
1
0n-2
.
18
.
0-rnd3
.
1' of git://github
.
com
.
.
.
commit
|
commitdiff
|
tree
2018-06-19
J
u
nio C Hamano
Merge br
a
n
ch 'cf/submodul
e
-pr
o
g
r
ess-dissociate'
commit
|
commitdiff
|
tree
2018-06-19
Jun
i
o C Hamano
Merge branch 'js/rebase-
i
-root-
f
ix'
commit
|
commitdiff
|
tree
2018-06-19
Stefan Bell
e
r
t
7400: encap
s
ulate setup c
o
de in test_expect_success
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
T
odd Zulli
n
ger
t3404: chec
k
root commit
i
n
'rebase -i --root reword
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-19
K
a
r
th
i
keyan Singara
v
elan
doc
:
fix typos
i
n
d
ocumentation and re
l
e
ase
n
otes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
T
o
dd Zullinger
g
it-c
r
ed
e
ntial-netrc: make "all" d
e
fault target of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Juni
o
C Hamano
Almost 2
.
1
8
fi
n
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Hamano
Me
r
ge branch 'es/make-no-ic
o
nv'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
i
o C Hamano
Merge branch 'sg
/
t7406-chain-fix'
commit
|
commitdiff
|
tree
2018-06-18
Ju
n
io C Hamano
Merge branch 'ks/b
r
anch-set-
u
pstream'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Merge branch 'js/rebase-i-root-fix'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
n
o
Merge branch '
j
k/ewah-bounds-ch
e
ck
'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Merge ta
g
'l10n-2
.
18
.
0-rnd3' of git://github
.
com
/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2018-06-18
J
u
ni
o
C Hamano
A bunch of m
i
cro-fixes bef
o
re goin
g
2
.
18 fi
n
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio
C Hamano
Merge
bra
n
c
h
'sb
/
blame-
c
olor'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Ham
a
no
Mer
g
e branch 'mw
/
doc-merge-
e
n
umf
i
x'
commit
|
commitdiff
|
tree
2018-06-18
Junio C H
a
mano
Merge bran
c
h
'en/rename-direct
o
ry
-
d
e
tection'
commit
|
commitdiff
|
tree
2018-06-18
Junio
C Hama
n
o
Mer
g
e branch 'rd/doc-remo
t
e-tracking-with-hyphen'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Haman
o
Merge
b
r
anch 'jl/zlib-resto
r
e
-nul-t
e
rmination'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branch 'ab/
c
red-netrc-
n
o-autodie'
commit
|
commitdiff
|
tree
2018-06-18
J
u
nio C Hamano
Merge bran
c
h '
k
m
/doc
-
w
orkflow
s
-typofix'
commit
|
commitdiff
|
tree
2018-06-18
J
unio C Hamano
Me
r
ge branch
'
ld
/
git
-
p4-updat
e
s
'
commit
|
commitdiff
|
tree
2018-06-18
J
uni
o
C Ham
a
n
o
Merge
branch
'
r
d/diff-option
s
-typofi
x
'
commit
|
commitdiff
|
tree
2018-06-18
Junio C Hamano
Merge branc
h
'rd/com
m
e
n
t-ty
p
ofix-in-sha1
-
file'
commit
|
commitdiff
|
tree
2018-06-18
Ren
é
Scharfe
merge-recursi
v
e: use xstr
d
up()
i
ns
t
ead of fixed b
u
ff
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZE
D
E
R
Gábor
RelNot
e
s 2
.
18: minor fix
to entry a
b
out dynamical
l
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
SZEDER G
á
b
or
t7406-submodule-update: fix br
o
ken &&-c
h
ains
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
J
o
hannes Schin
d
elin
rebase --root: fix a
m
en
d
i
ng root
c
ommit messages
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd Zul
l
in
g
er
rebase -
-
root:
demonstr
a
te a bug whi
l
e amending root
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff
Ki
n
g
e
w
ah: adjust callers of ewah_read_mmap()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Jeff King
ewah
_
r
e
ad_mmap:
bounds-c
h
eck mmap reads
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Kaartic
S
i
varaam
t3200: clarify description of --set-upstream test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Luis Marsan
o
git-credential-net
r
c: fix exit sta
t
us
wh
e
n
t
e
s
ts fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Luis Marsan
o
git-credential-ne
t
rc: us
e
in-tree Git
.
pm
f
or tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-18
Todd
Z
ulli
n
ger
git-cre
d
ential-netrc:
minor whitespace clea
n
up
i
n test
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
E
r
i
c Sunshine
Makefile: make NO_ICON
V
really m
e
an "no iconv"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-15
Junio C Hamano
tests: clea
n
af
t
e
r
SANITY tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
Stefan Beller
t5526
:
test recursi
v
e submodules when fetchi
n
g
moved
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
S
t
e
fan B
e
l
l
er
submodul
e
: fix NULL
c
o
r
re
c
tness in renamed
b
roken subm
o
dules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
M
e
ng-Su
n
g
W
u
doc: u
p
date the
order of the s
y
ntax `g
i
t merg
e
-
-cont
i
nue
`
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René
S
ch
a
rfe
blame:
re
l
ease string_list after us
e
in pa
r
s
e
_
co
l
o
r
_
fiel
d
s(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-14
René Scharfe
merge-recursive: use xstrdup() i
n
stead of fixed buffer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o
C Hamano
G
i
t 2
.
1
8
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
J
unio C
Hamano
M
erge branch 'jk/index-pack-ma
i
nt'
commit
|
commitdiff
|
tree
2018-06-13
Jun
i
o C Hamano
M
e
rge branch 'sg/completi
o
n-zsh
-
workar
o
und'
commit
|
commitdiff
|
tree
2018-06-13
Junio C
Hamano
M
e
r
ge bran
c
h 'sb/submodu
l
e-merge
-
in-mer
g
e-
r
e
c
ursive'
commit
|
commitdiff
|
tree
2018-06-13
Junio
C
H
a
m
an
o
Merge branch '
j
k/subm
o
dule-fsc
k
-
loose-fixup'
commit
|
commitdiff
|
tree
2018-06-13
Kirill Sm
e
lkov
fetch-pack: test explicit
l
y that --al
l
can
fet
c
h
t
ag
.
.
.
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Jeremy Lint
o
n
packfi
l
e: correct zli
b
buf
f
er
h
andling
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
E
l
i
j
ah
Newren
RelNotes 2
.
18: clarify where directory rename de
t
ection
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
R
o
bert
P
.
J
.
Day
Use hyph
e
na
t
ed "remote-t
r
a
cking branch" (docs and
c
ommen
t
s)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-13
Æv
a
r Arnf
j
ör
ð
Bjarmason
git-credential-net
r
c: remo
v
e us
e
of "autodie
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Diamand
git-p4: a
u
to-s
i
ze the block
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Dia
m
and
git-
p
4: narrow
t
he scop
e
of exception
s
caught when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Lu
k
e D
i
a
mand
git-p4: raise
except
i
on
s
f
rom p4C
m
dList bas
e
d on
error
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
ma
n
d
git-p4
:
bet
t
er
error reporting
when p4 fa
i
ls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke D
i
ama
n
d
git-p4:
a
dd op
t
i
on
to
d
isable syncing
o
f p4/master
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Luke Di
a
mand
g
it-p4:
disable-reba
s
e: a
l
low setting t
h
i
s via confi
g
urat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Romain
M
e
r
land
git
-
p4: add options -
-
commit and --disable-rebase
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
M
a
saya Suzuk
i
buil
t
in
/
send-pack: po
p
ulate the default
configs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Jonathan T
a
n
list-objects: che
c
k if f
i
lter is NU
L
L
before using
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
Kyle
M
eyer
git
w
o
r
kflows:
fi
x
gramm
a
r in 'Merge
u
pwards' r
u
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-12
SZE
D
ER
Gábor
completion: c
o
rrect zsh detection
w
h
en run from git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Junio C Haman
o
index-
p
a
c
k:
c
orrec
t
in
s
tall_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-options
.
txt:
fix minor t
y
pos, fon
t
inconsiste
n
cies
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Jeff
King
fetch
-
pack: don't try t
o
fetch peel values
w
ith --all
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2018-06-11
Leif M
i
ddelsch
u
lte
merg
e
-
s
ubmo
d
u
le
:
r
educe output verbosit
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next