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
merge-recursive: make sure when we say we abort that we actually abort
2018-07-11
Elijah Newr
e
n
m
erge-recursi
v
e: make sure when we sa
y
we abort t
h
at
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-11
Elijah Newr
e
n
t6044: ad
d
a testcase for in
d
ex matchi
n
g head, when
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah Newren
t6044:
v
erify tha
t
merges expe
c
ted to abort actually
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah
Ne
w
re
n
index_has_c
h
a
n
ges(): av
o
id assumin
g
o
pera
t
ing
on the_index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-07-03
Elijah N
e
wre
n
read-cache
.
c: move inde
x
_has_changes() from me
r
ge
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio C
Hamano
Git 2
.
17
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Jun
i
o C Hamano
M
erge
branch
'jk/subm
o
dule-f
s
ck-loose'
int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2018-05-22
J
unio C
H
amano
Sync
with
G
it
2
.
16
.
4
commit
|
commitdiff
|
tree
2018-05-22
Junio
C
Hamano
Git 2
.
16
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio C Ha
m
ano
Sy
n
c
w
i
th Git 2
.
15
.
2
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hamano
Git 2
.
15
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Junio C Hama
n
o
Sync w
i
th Git 2
.
14
.
4
commit
|
commitdiff
|
tree
2018-05-22
J
u
nio C Hamano
Git
2
.
14
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
Ju
n
io C Hama
n
o
Sy
n
c
with Git 2
.
13
.
7
commit
|
commitdiff
|
tree
2018-05-22
J
unio C Hamano
G
it 2
.
13
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-05-22
J
u
nio C Hama
n
o
M
erge branch
'jk
/
submodul
e
-
fix-lo
o
se' int
o
maint-2
.
13
commit
|
commitdiff
|
tree
2018-04-02
J
unio C Hamano
Git
2
.
17
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-04-02
Jun
i
o C Hamano
M
e
rge tag 'l10n
-
2
.
17
.
0-rnd1'
of
git://github
.
c
o
m/git
.
.
.
commit
|
commitdiff
|
tree
2018-04-02
Juni
o
C Ha
m
a
n
o
M
e
rge branch 'pw/add
-
p-
s
ingl
e
'
commit
|
commitdiff
|
tree
2018-04-01
Ævar Arnfjörð Bjarmason
add -p
:
f
ix 2
.
17
.
0
-
rc* regression due to
mov
e
d
code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-29
Junio C H
a
mano
M
e
rge
branch 'jh/
p
a
rtial-c
l
one'
commit
|
commitdiff
|
tree
2018-03-29
Jo
n
at
h
an Nieder
u
pload-pack
:
di
s
able object
filtering
w
hen disabled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
J
u
ni
o
C Hamano
Git 2
.
17-
r
c2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Merge br
a
nch 'tg/stash-doc-typofix'
commit
|
commitdiff
|
tree
2018-03-28
J
u
nio C H
a
mano
Mer
g
e b
r
anch 'pc/submodul
e
-helpe
r
'
commit
|
commitdiff
|
tree
2018-03-28
Junio C Hamano
Merge branch 'nd/parseop
t
-completio
n
'
commit
|
commitdiff
|
tree
2018-03-28
Stefan Bel
l
er
su
b
m
od
u
le dein
i
t: handle non existing pathspe
c
s
g
r
a
c
ef
u
lly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-28
Thomas Gummerer
git-stash
.
txt: remo
v
e extra s
q
uare b
r
acket
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-25
René Scha
r
fe
unpa
c
k-t
r
e
es: release oid
_
array after use in check_updates(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-23
Junio C Hamano
t
9902
:
disable t
e
st on the list of merge-st
r
a
tegies
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-22
J
unio C
Hamano
S
y
nc with G
i
t
2
.
16
.
3
commit
|
commitdiff
|
tree
2018-03-22
Jun
i
o C
H
ama
n
o
Git 2
.
16
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-22
Junio C
H
ama
n
o
Merge br
a
nch 'ms
/
non
-
ascii-ticks' into maint
commit
|
commitdiff
|
tree
2018-03-22
J
unio C Haman
o
Merge branch 'jk/cached-commit-b
u
ffer' into mai
n
t
commit
|
commitdiff
|
tree
2018-03-22
Juni
o
C
H
a
m
an
o
Merge branch 'sm
/
mv-dry-ru
n
-update
'
into maint
commit
|
commitdiff
|
tree
2018-03-22
Junio
C
Hama
n
o
Merge branch 'tg/worktree
-
create-trackin
g
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2018-03-22
Ju
n
io C Hamano
M
e
rge branch 'gs/test-un
s
e
t-xdg-cache-home' int
o
maint
commit
|
commitdiff
|
tree
2018-03-22
J
u
n
i
o C H
a
mano
Merge branch
'
sb/status-doc-fix
'
into m
a
int
commit
|
commitdiff
|
tree
2018-03-22
J
u
nio C Ham
a
no
Merge branch
'
rd/typofix'
i
nto maint
commit
|
commitdiff
|
tree
2018-03-22
J
u
n
io C Hamano
Merge
branch 'b
p
/fs
m
o
ni
t
or'
i
n
to main
t
commit
|
commitdiff
|
tree
2018-03-22
Junio C Ha
m
ano
Merge br
a
nch 'bc/doc-interpret-trail
e
rs-grammofix'
.
.
.
commit
|
commitdiff
|
tree
2018-03-22
Junio C
Hamano
Merge b
r
anc
h
'sg
/
doc-t
e
st-must-fail
-
a
rgs' into maint
commit
|
commitdiff
|
tree
2018-03-22
J
u
ni
o
C Haman
o
Me
r
ge branch 'rj
/
sp
a
rse-updates' into maint
commit
|
commitdiff
|
tree
2018-03-22
Ju
n
io C
Hamano
Merge branch 'jk/
g
ettex
t
-
p
oison' into ma
i
nt
commit
|
commitdiff
|
tree
2018-03-22
Junio C Ham
a
no
Merge branch '
n
d
/ignore-glob-
d
oc
-
update' into maint
commit
|
commitdiff
|
tree
2018-03-22
J
unio
C
Hamano
Merge branch
'
r
s/cocci-strbuf-addf-to-addstr' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2018-03-22
J
u
n
io C Haman
o
Merge br
a
nch 'jc/wor
k
tre
e
-a
d
d-sh
o
rt-help' i
n
to m
a
in
t
commit
|
commitdiff
|
tree
2018-03-22
Junio C
H
a
mano
M
e
rge branch
'tz
/
doc-show
-
de
f
aults-to-head' into mai
n
t
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hamano
Merge br
a
nch '
n
d/sh
a
re
d
-ind
e
x-fix' into maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hamano
M
e
rge
b
ranch 'jc/mailinfo-cleanup-f
i
x' int
o
m
ai
n
t
commit
|
commitdiff
|
tree
2018-03-22
Junio
C Hamano
Mer
g
e br
a
n
ch 'rb/hashmap-h-c
o
mpilation-f
i
x' into maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Haman
o
Merge
branch 'r
s
/describe-un
i
que-a
b
brev'
i
nto maint
commit
|
commitdiff
|
tree
2018-03-22
Junio
C
Haman
o
Merge
b
ranch '
k
s/submodule-doc-updates' i
n
t
o
maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hamano
Me
r
ge b
r
anch 'cl/t9001-c
l
eanup' int
o
maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hamano
Merge
b
ranch 'bw/oidmap-au
t
oi
n
it' into main
t
commit
|
commitdiff
|
tree
2018-03-22
Juni
o
C Ha
m
ano
Mer
g
e branch 'sg/test-i
1
8ngrep
'
i
n
to maint
commit
|
commitdiff
|
tree
2018-03-22
J
uni
o
C Haman
o
Merge
b
ranch 'jt
/
fsck-co
d
e
-cleanup' into
mai
n
t
commit
|
commitdiff
|
tree
2018-03-22
J
u
n
io C Hamano
Merge
b
ranch 'ew/svn-bra
n
ch-seg
f
ault-fix'
i
nto main
t
commit
|
commitdiff
|
tree
2018-03-22
J
u
nio C
Hamano
Merge
bran
c
h
'
nd/li
s
t
-
me
r
g
e-strategy'
into maint
commit
|
commitdiff
|
tree
2018-03-22
Jun
i
o C Hamano
M
erge branch
'jk/dae
m
o
n-fixes'
i
nto maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Ha
m
a
no
Merge branch
'tg/split-index-
f
ix
e
s' into maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hama
n
o
Merge branch 'mr/p
a
ck
e
d-ref-store-fix' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2018-03-22
J
unio C Hamano
Merge branch '
j
t/h
t
tp-redact
-
coo
k
ies' i
n
t
o maint
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hamano
Merge b
r
anch 'nd/diff-f
l
ush-before-
w
arning' into ma
i
nt
commit
|
commitdiff
|
tree
2018-03-22
Junio C Hamano
Mer
g
e
branch
'sg/
t
ravis
-
build
-
during-script-ph
a
se'
.
.
.
commit
|
commitdiff
|
tree
2018-03-22
SZEDER Gáb
o
r
completion
:
clea
r
c
a
c
h
e
d
--optio
n
s when sourcing
the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-21
Junio C Haman
o
Gi
t
2
.
17
-
rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hama
n
o
Merg
e
bran
c
h 'j
k
/attribute
s
-path-doc'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hamano
Merge branch 'rj/warning-uninitializ
e
d
-
fix
'
commit
|
commitdiff
|
tree
2018-03-21
Juni
o
C
H
a
m
ano
Me
r
ge branch 'tz
/
compl
e
te-tag-delete-tag
n
ame'
commit
|
commitdiff
|
tree
2018-03-21
J
unio C Ham
a
n
o
M
e
r
g
e
branch 'ml/fi
l
t
er
-
b
r
anch-por
t
ability
-
fix
'
commit
|
commitdiff
|
tree
2018-03-21
J
u
n
io C Hamano
Merge branch 'js/m
i
ng-st
r
ft
i
me
'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hama
n
o
Merge branch 'dp/merge-st
r
at
e
gy-
d
oc
-
f
ix'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hamano
Merge br
a
nch 'tz/relno
t
es-1
.
7-o
n
-perl'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hamano
Merge branch '
r
j/http-code-cleanup'
commit
|
commitdiff
|
tree
2018-03-21
Juni
o
C
H
ama
n
o
Merge branch 'ks/t
3
200-typofix'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hamano
Merg
e
branch 'jt/transfer-fsck
-
wi
t
h-pro
m
issor'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Haman
o
M
erge branch '
b
p/refresh-cac
h
e-e
n
t-rehash-fix'
commit
|
commitdiff
|
tree
2018-03-21
Ju
n
io
C
Hamano
M
e
rge
b
r
anch 'jh/fsck-promisors'
commit
|
commitdiff
|
tree
2018-03-21
Junio
C
Haman
o
M
e
r
g
e b
r
a
n
ch 'ma/skip-w
r
i
ting-unchanged-index'
commit
|
commitdiff
|
tree
2018-03-21
Junio C Hama
n
o
Merge branch
'
m
a
/
c
onfig-pa
g
e-onl
y
-in-
l
ist-mode'
commit
|
commitdiff
|
tree
2018-03-20
Jeff King
doc/gitattributes: mention non-recu
r
s
i
v
e behavior
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-20
Ramsay Jones
r
ead-cache:
fix an -Wmaybe-u
n
init
i
alized
warning
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-20
Ram
s
ay Jones
-Wuninitializ
e
d: remo
v
e some 'i
n
it-self' workaroun
d
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-19
Mi
c
hele
Locati
filter-branch: use printf instead of
e
cho -e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-19
Johannes Schindel
i
n
min
g
w: abort on
invalid strfti
m
e formats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-19
Todd Zu
l
l
inger
comp
l
e
t
ion: comple
t
e
t
a
gs with git tag --d
e
lete/-
-
verify
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-19
David Pursehouse
Documentation/merge-strategies: typof
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-16
Todd Zullinger
RelNotes:
a
dd de
t
ails on Perl module change
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-15
Junio C H
a
mano
Git
2
.
1
7
-rc0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-15
Juni
o
C Ham
a
no
M
e
rge b
r
anch 'tl/userdiff-
c
sharp-async'
commit
|
commitdiff
|
tree
2018-03-15
Junio C Hamano
Merg
e
branch 'sg/
c
v
s
-tests
-
with
-
x'
commit
|
commitdiff
|
tree
2018-03-15
Juni
o
C
Hamano
Merge
b
r
anch 'ab/man-s
e
c-l
i
st'
commit
|
commitdiff
|
tree
2018-03-15
J
u
n
i
o
C
Hamano
M
erge b
r
anch
'ab/pe
r
l
-
fixes'
commit
|
commitdiff
|
tree
2018-03-15
Jun
i
o
C
Hamano
Merge
b
ran
c
h
'c
l
/
send-email-reply-
t
o'
commit
|
commitdiff
|
tree
2018-03-15
Junio
C
Ha
m
ano
Merge branch 'np/s
e
n
d
-
e
mail-header-parsing'
commit
|
commitdiff
|
tree
2018-03-15
Kaartic Si
v
araa
m
t/
t
3
2
00: fix a typo in a test d
e
s
c
rip
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-15
R
a
msay Jones
http: fix an unuse
d
v
ariable warning for 'curl
_
no_proxy'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-15
Ben Pea
r
t
F
i
x
bugs
p
re
v
ent
i
ng adding updated
c
a
c
h
e entries to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2018-03-15
Jonathan Tan
fetc
h
-pack
:
do
n
ot check links for partial fe
t
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next