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
completion: fix completing merge strategies on non-C locales
2018-01-26
Duy Ng
u
yen
co
m
pleti
o
n: fix complet
i
ng merge strategie
s
on non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-22
Junio C Hamano
G
i
t 2
.
16
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-22
Ju
n
i
o
C Hama
n
o
Merge branch '
b
c/h
a
sh-algo
'
in
t
o maint
commit
|
commitdiff
|
tree
2018-01-22
Eric
S
unshine
t
5601-clo
n
e: test case-
c
onfli
c
tin
g
files
on case-insensitive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-19
brian m
.
carlso
n
repository: pre-i
n
itialize
h
a
s
h
algo pointer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-17
Junio C Hamano
Git 2
.
16
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-16
Junio C
H
ama
n
o
Merge t
a
g 'l10
n
-2
.
16
.
0-
r
nd2'
o
f
git://g
i
th
u
b
.
com/git
.
.
.
commit
|
commitdiff
|
tree
2018-01-12
S
Z
EDER Gáb
o
r
RelNotes: minor t
y
pofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
Junio C Ham
a
no
Git 2
.
16-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-11
Juni
o
C Hamano
Merge branc
h
'
jh/o
b
j
ect-
f
i
l
tering'
commit
|
commitdiff
|
tree
2018-01-11
Junio C Hamano
Merge branch '
t
g/worktree-creat
e
-
track
i
ng'
commit
|
commitdiff
|
tree
2018-01-11
Junio C Haman
o
Me
r
ge branch
'js/test-wit
h
-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-11
Ralf Th
i
elow
Do
c
umentati
o
n/
g
it-worktree
.
txt: add mis
s
ing `
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Beat Bolli
t3900:
a
dd some more qu
o
tes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Junio
C Hamano
RelNotes
up
d
ate before -rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-10
Junio C Hamano
Merge br
a
nch
'
j
s
/pe
r
l-path-workaround-in-tests'
commit
|
commitdiff
|
tree
2018-01-10
Junio
C
Hamano
Merg
e
branch 'ew/empty-me
r
ge
-
with-dir
t
y-
i
ndex'
commit
|
commitdiff
|
tree
2018-01-10
Juni
o
C Hama
n
o
Me
r
ge
b
ranch 'ma/
b
isect-leakfix
'
commit
|
commitdiff
|
tree
2018-01-10
Junio C Ha
m
ano
Merge branch 'js/fix-
m
erge-arg-qu
o
ting-in-rebase-p'
commit
|
commitdiff
|
tree
2018-01-10
J
o
h
a
n
nes Schindelin
mingw: ha
n
dle
GITPERLLIB
in t0021 in a Wi
n
dows-compatibl
e
w
ay
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio C Ha
m
ano
Merge branch 'j
k
/d
o
c-diff-options'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge br
a
nch 'bw/pro
t
ocol-v1'
commit
|
commitdiff
|
tree
2018-01-09
J
unio C
H
am
a
no
Merge bran
c
h 'sg/travis-check-untracked'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio C Hamano
Merg
e
br
a
n
c
h
'
j
s/test-with-ws-in-path'
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
Hamano
Merge
bra
n
ch 'bc/
s
ubmitti
n
g-pat
c
he
s
-in-asci
i
doc'
commit
|
commitdiff
|
tree
2018-01-09
Junio C
Hamano
Merge br
a
n
ch 'sg
/
travis-skip-iden
t
ical-test'
commit
|
commitdiff
|
tree
2018-01-09
Junio C Hamano
Merge branch 'ab/d
c
-sha1-loo
s
e-en
d
s
'
commit
|
commitdiff
|
tree
2018-01-09
J
uni
o
C Hamano
Merge bran
c
h
'sg/
t
ravis-fixes'
commit
|
commitdiff
|
tree
2018-01-09
J
u
nio C Ha
m
a
n
o
Merge
b
ranch 'js/misc-git-gui-stuff' of
.
.
/
git-gu
i
commit
|
commitdiff
|
tree
2018-01-09
J
ohan
n
es Schinde
l
i
n
git
-
gui: allow Ctrl+T
t
o toggle multiple
p
a
ths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes
Schindel
i
n
git-gui: fix
e
xception wh
e
n trying to stage with empt
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes
S
ch
i
n
d
elin
git-gui: avoid e
x
ce
p
t
ion up
o
n Ctrl+T
i
n
an empty list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Johannes Schindelin
git gui:
fix staging a second lin
e
to a
1-li
n
e file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-09
Junio
C
H
amano
M
e
rge bran
c
h 'ew/empty-merge-with-dirty-index-mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2018-01-09
Junio C
H
a
mano
m
erge-recursive: do not look a
t
t
h
e index
d
urin
g
recursive
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-08
T
h
omas G
u
mmere
r
oidset: don't return v
a
lue from
o
idset_init
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Git 2
.
16-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-05
Junio C H
a
mano
Mer
g
e bran
c
h 'j
s
/se
q
uencer-cleanup
s
'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hama
n
o
M
erg
e
branch 'j
h
/memihash-opt'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Ham
a
no
Merge branch 'tb/te
s
t-lint-w
c
-l'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge bra
n
ch '
r
s/use-
a
rgv
-
array-
i
n-child-pro
c
ess'
commit
|
commitdiff
|
tree
2018-01-05
Jun
i
o C Hamano
Merge branch
'ld/
p
4-multi
p
le-shelves'
commit
|
commitdiff
|
tree
2018-01-05
Junio C H
a
ma
n
o
Merge bra
n
ch 'jd/fix-
s
tr
b
uf
-
add-urlencode
-
bytes'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Haman
o
Merge branch
'
ew/empty
-
merge
-
wi
t
h-dirt
y
-index'
commit
|
commitdiff
|
tree
2018-01-05
Junio C Hamano
Merge
branch 'd
b
/doc-c
o
nfig
-
s
ection-
n
am
e
s-with-bs'
commit
|
commitdiff
|
tree
2018-01-05
Junio C
Hama
n
o
Mer
g
e branch 'jk/test-suite-
t
r
a
c
i
ng'
commit
|
commitdiff
|
tree
2018-01-05
Johannes Schinde
l
i
n
rebase -p: fix q
u
o
t
ing when cal
l
ing `git mer
g
e`
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Jef
f
King
d
ocs/diff-option
s
: clarify scope
o
f diff-f
i
lter types
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-04
Todd
Z
ullinger
htt
p
: fix v1
p
ro
t
ocol tests with a
p
ache httpd < 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Johann
e
s Schi
n
delin
t0302 & t3900: add forgotten quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
J
o
hann
e
s Schi
n
delin
A
llow the te
s
t suite
to
p
ass i
n
a directory
w
hos
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Ævar
Arnfjörð
B
jarmason
b
i
sect: fix a regression causin
g
a segfault
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
Todd Zull
i
n
g
er
doc
/
Su
b
mittingPatches
:
im
p
rove
t
ext fo
r
matting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDE
R
Gábor
tra
v
is-c
i
:
check
t
hat al
l
b
uild
a
rtifacts
a
re
.
g
iti
g
nore-d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-03
SZEDER Gábor
tr
a
vis-ci: don'
t
store P4 and Git LFS
i
n
the
working
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZEDER
Gábor
t
ravis-ci: recor
d
and skip successfully bu
i
l
t
trees
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
SZED
E
R Gábor
travis-ci: cre
a
te the cach
e
directory early in th
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-01-02
S
ZEDER Gábor
t
rav
i
s-ci: print
t
he "tip of br
a
nch
i
s exactly at tag
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
Junio C
H
amano
Git 2
.
16-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-28
J
u
n
i
o C Hamano
Merge branch 'sb/describe-blo
b
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merg
e
branch 'hi
/
me
r
ge-v
e
rify-sig-config'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge
b
ranch 'ws/cur
l
-
ht
t
p-proxy-o
v
er-https'
commit
|
commitdiff
|
tree
2017-12-28
Junio C H
a
mano
Merge branc
h
'ks/doc-previous
-
checko
u
t
'
commit
|
commitdiff
|
tree
2017-12-28
Ju
n
io C Hamano
M
erg
e
bra
n
c
h '
k
s/reb
a
se-error-messages'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio C H
a
m
an
o
Merge branch
'
sr/http-
s
slverify-config-doc'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch 'n
m
/imap-sen
d
-quote-server
-
folder-name'
commit
|
commitdiff
|
tree
2017-12-28
Junio C H
a
mano
Merge b
r
an
c
h 'bp/fsmoni
t
or'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio
C Haman
o
Merge branch 'j
h
/
partial-c
l
one-doc'
commit
|
commitdiff
|
tree
2017-12-28
J
u
nio C Hamano
Merge b
r
anc
h
'jt/tra
n
sport
-
hide-v
t
ab
l
e'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C Hamano
Me
r
g
e
branch 'js/enhanced-vers
i
on-
i
nfo'
commit
|
commitdiff
|
tree
2017-12-28
J
u
n
i
o
C
Hamano
Merge branch 'tz/li
b
-
g
i
t
-svn-svns
e
r
v
e
-
tests'
commit
|
commitdiff
|
tree
2017-12-28
J
unio C Hamano
M
erge
b
ranch 'ew/svn-crlf'
commit
|
commitdiff
|
tree
2017-12-28
Junio C H
a
mano
Merge branch 'cc/skip-to-
o
ptiona
l
-va
l
'
commit
|
commitdiff
|
tree
2017-12-28
Junio C Hamano
Merge branch 'ra/prompt-eread-fix'
commit
|
commitdiff
|
tree
2017-12-28
Jun
i
o C
Haman
o
M
e
rge b
r
anch
'
bw/
p
ath-
d
oc'
commit
|
commitdiff
|
tree
2017-12-28
Æv
a
r Arnfjörð
B
j
armason
M
akefil
e
: NO_OPENSSL=1 should no longer imply BLK_SHA1=
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johannes
Schindelin
s
e
quenc
e
r
:
d
o not inve
n
t
whitespac
e
when tra
n
sforming
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johann
e
s Schindelin
sequencer: report w
h
en noop has an argument
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johannes S
c
hindelin
seq
u
e
nc
e
r: remove superfluous conditional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Johannes Schindelin
sequencer: strip bogus
L
F
at end
o
f
e
r
r
or message
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Joha
n
n
e
s
S
chindeli
n
re
b
ase
:
do not c
o
n
t
i
n
ue wh
e
n the todo list generation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
SZEDER Gábor
t
r
av
i
s-ci: only
pr
i
nt test failures
i
f the
r
e are te
s
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
SZEDE
R
Gábor
tr
a
vis
-
ci
:
save
prove state
f
or
the 32 bit
L
inux build
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
S
ZEDER Gáb
o
r
travis-ci: d
o
n't instal
l
default addon packages for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
SZEDER Gábor
travis-ci: fi
n
e
tune the u
s
e of
'set -x' in
'
c
i/*'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Junio C Hama
n
o
RelNot
e
s: the eleventh ba
t
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2017-12-27
Junio C Ham
a
no
Mer
g
e
branch
'rb
/
quick-insta
l
l
-
doc'
commit
|
commitdiff
|
tree
2017-12-27
Junio C Hama
n
o
Merge branch 'jt
/
transpo
r
t-no-more-
r
s
y
nc'
commit
|
commitdiff
|
tree
2017-12-27
J
unio C Hamano
Merge branch 'sg/travis-fixes'
commit
|
commitdiff
|
tree
2017-12-27
Junio C H
a
mano
Merge br
a
nch
'
sb/te
s
t
-helper-exc
l
udes'
commit
|
commitdiff
|
tree
2017-12-27
Jun
i
o
C
Hamano
Merg
e
branch 'o
t
/pre
t
ty'
commit
|
commitdiff
|
tree
2017-12-27
J
unio C Hamano
Merge bra
n
ch 'bw/submodule-sans-c
a
che-compat'
commit
|
commitdiff
|
tree
2017-12-27
Junio C Haman
o
Mer
g
e branch 'es/
c
lone-shared-worktree'
commit
|
commitdiff
|
tree
2017-12-27
J
uni
o
C Ham
a
no
M
erge bra
n
c
h
'
t
b/delimit-pretty-t
r
ailers-arg
s
-wit
h
.
.
.
commit
|
commitdiff
|
tree
2017-12-27
Junio
C Hamano
Merge branch 'rs/fmt-merge-
m
sg-leakfix'
commit
|
commitdiff
|
tree
2017-12-27
Jun
i
o C Hamano
Merge br
a
n
ch
'jt/d
e
c
o
r
a
te
-
api'
commit
|
commitdiff
|
tree
2017-12-27
Junio C Hama
n
o
Merge
b
ranch 'j
k
/cvsimport
-
quoting'
commit
|
commitdiff
|
tree
2017-12-27
Juni
o
C
Ha
m
ano
Merge branch 'db/d
o
c-wo
r
kf
l
ows-neuter-the-maintainer
'
commit
|
commitdiff
|
tree
2017-12-27
Juni
o
C Ham
a
no
M
e
rge bran
c
h
'ks/branch-cleanup'
commit
|
commitdiff
|
tree
2017-12-27
Junio C Ha
m
ano
Merge branch
'
rs/strbuf-re
a
d-once-r
e
se
t
-len
g
th'
commit
|
commitdiff
|
tree
next