repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'dl/subtree-push-no-squash'
2015-05-22
Junio C
Haman
o
Merge branc
h
'dl/subtree-push
-
no-squash'
commit
|
commitdiff
|
tree
2015-05-22
Ju
n
io C Hamano
Merge b
r
a
n
ch '
s
g/completion-omit-credentia
l
-h
e
lpers'
commit
|
commitdiff
|
tree
2015-05-22
J
u
nio
C Haman
o
Merge branch 'd
l
/branch
-
error-message'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o C Hamano
T
h
ird batch fo
r
2
.
5 c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C
H
ama
n
o
Me
r
ge branc
h
'sb/ref-lock-lose-lock-fd'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hama
n
o
Mer
g
e
b
r
a
nch
'kn/
c
a
t-file-l
i
terally'
commit
|
commitdiff
|
tree
2015-05-19
J
u
n
i
o C Hamano
Me
r
ge branch 'nd/dw
i
m
-wildcards-as-pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Hamano
Merg
e
branch 'jc/m
e
rge'
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hama
n
o
Merge branch
'p
h
/rebase
-
i-redo
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jc/test-prereq-validate'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Ha
m
ano
M
erge
bran
c
h
'
bc/c
o
nne
c
t
-
plink
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
M
e
rge branch 'jk/test-chain-lint'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
i
o
C
H
a
mano
Merge bran
c
h 'f
g
/d
o
cument-commit-message-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge branch 'jk/sta
s
h-r
e
quire-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merge
bra
n
ch 'jk/git-no-mor
e
-argv0-path-mu
n
ging'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C H
a
mano
Merge
b
ra
n
ch 'jc/gi
t
igno
r
e-precedence'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ham
a
n
o
Merge
b
ranch 'nd/diff
-
i-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C
Hamano
Sync with 2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
Git
2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
Junio
C Hamano
Mer
g
e branch 'sb/l
i
ne-log-plug-pairdif
f
-
leak' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Me
r
ge br
a
nc
h
'sb/test-b
i
t
m
ap-fr
e
e-at-end' into m
a
i
n
t
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hama
n
o
Me
r
ge b
r
anch
'nd
/
t1509-chroot-test' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hamano
Merge br
a
nch 'jk/type-f
r
om-string-g
e
ntly' into main
t
commit
|
commitdiff
|
tree
2015-05-13
J
uni
o
C Hamano
Mer
g
e branch 'ep/fix-test-lib-functions-rep
o
r
t
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C
H
amano
Mer
g
e branch 'cn/bom-i
n
-gitignore' into
m
a
int
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Merge branch 'jk/prune-m
t
ime' int
o
maint
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
i
o
C Haman
o
M
e
rge branch
'jk/
i
nit-core-worktree-at
-
root' into maint
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C H
a
man
o
Mer
g
e
branch 'maint
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Sync with
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'mm/usage-
l
og-
l
-can
-
t
a
ke-reg
e
x
' i
n
t
o ma
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge branch 'jc/
d
iff-no-index-d-f' i
n
t
o maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge bran
c
h
'
o
h/
f
ix-config-default-user-n
a
me-section
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Haman
o
Me
r
g
e
branch 'jc/epochtime-wo-tz' into mai
n
t-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
Second batch for 2
.
5
c
ycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
n
o
M
er
g
e
br
a
nch 'pt/xdg-config-p
a
th
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e
branch 'ep/do-not-feed-a-
p
ointer-to-array-si
z
e
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
io
C
Hamano
M
e
rge branch 'jc/h
a
sh-object'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bran
c
h 's
b
/prefix-path-free
-
result
s
'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch
'sg/complet
i
o
n-n
o
-redundant-all
-
comman
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch 'sg/complete-decorat
e
-f
u
ll-not-l
o
ng'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Mer
g
e br
a
nch 'jk/filter-branch-use-of-sed-on-incomp
l
ete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merg
e
b
r
anch '
j
c/d
a
emon-no-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
erge branch 'jn
/
c
l
e
a
n
-
use-e
r
r
o
r-n
o
t-fprintf
-
on-st
d
e
rr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch 'tb/bla
m
e-resurrec
t
-con
v
ert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Mer
g
e branch 'va/fix-git-p
4
-tests'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
erge branch 'ld/p4-cas
e
-fold'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Me
r
ge branch 'jk/r
e
b
a
se-qu
i
et-
n
o
op'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ham
a
no
M
e
rge br
a
nch 'va/p4-cl
i
e
nt
-
path'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
e
rge branch 'mm/add-p-split
-
error'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merge branch
'
tb/t0027-crlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Merge
branch 'ls/p4-ch
a
n
g
es-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
M
e
rge
branch
'
jc
/
plug-f
m
t-merge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merg
e
branch 'nd/s
l
im-index-pa
c
k
-
memory-usage'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Haman
o
M
e
rge
b
r
anch '
j
k/sti
l
l-interesting'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge branch 'jk/rea
d
ing-p
a
cked-re
f
s'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Me
r
ge branch
'lm
/
squelch-bg-prog
r
ess'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge bra
n
ch 'jk/sha1-
f
ile-reduce-us
e
les
s
-warning
s
'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
mano
M
e
r
g
e b
r
anc
h
'
nd/multiple-wor
k
-tr
e
es'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
n
o
Merg
e
br
a
nch 'pt/cred
e
n
t
ial-xdg'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ha
m
ano
First batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
H
aman
o
Merge branch 'jk/prune-mtime'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
branc
h
'mm/us
a
ge-lo
g
-l-can-take-
r
e
g
ex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branch 'ep/
f
ix-t
e
s
t
-lib-
f
unc
t
ions-report'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
e
rge branc
h
'c
n
/bom
-
in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
M
er
g
e branc
h
'jc/
e
pochtime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Hamano
Mer
g
e branch 'n
d
/t15
0
9-ch
r
oot-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch
'
oh/fix-config-d
e
fa
u
lt-u
s
er-name-section'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge br
a
nch 'j
k
/type-fro
m
-strin
g
-gently'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch 'sb/test-bitmap-free-at-e
n
d'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ha
m
a
n
o
Merge branc
h
'ld/p4-filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Hama
n
o
Merge branch '
t
s/chec
k
out-advice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merg
e
branch 'jk/init-core-worktree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
anch 'mh/show-branch-t
o
p
ic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h 'sb/line-log-plug-pairdiff-leak'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
M
erge
b
ranch 'jc/d
i
f
f
-no
-
i
nde
x
-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merg
e
br
a
nch 'bc/o
b
ject
-
id'
commit
|
commitdiff
|
tree
2015-05-05
Junio C Hama
n
o
daemon: unbre
a
k
NO_IPV6 bu
i
l
d
reg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C
H
amano
write_sha1_file(): do not use
a se
p
a
r
ate sha1[]
a
r
ray
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Ju
n
io
C Hama
n
o
Git 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge: de
p
recate '
g
it mer
g
e <
m
essag
e
> HE
A
D <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Ha
m
ano
merge: handle FETCH_HEAD i
n
t
ern
a
l
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio
C
Hamano
merge: dec
i
de if we
a
uto-
g
e
nerate the message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merg
e
:
ma
k
e collect_
p
arents() a
u
to-genera
t
e the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merg
e
: extract prepare_merge_message
(
) logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
m
erge: narrow scop
e
of m
e
rg
e
_
names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
m
erge: spl
i
t
r
educe
_
par
e
nts(
)
out of collect_pare
n
ts()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
Haman
o
m
e
rge: clarify col
l
ect_paren
t
s() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: small leakf
i
x
an
d
code simplificat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
merge
:
do not check argc to d
e
te
r
mine number o
f
r
e
mote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clarify "pulling into void" spec
i
al case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hama
n
o
t
5
520: test pulling an oct
o
pus into an unborn bran
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C Haman
o
t
5520: s
t
yle fixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Ha
m
ano
m
erge: simplify code flow
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
i
o C Hamano
m
e
rge: te
s
t th
e
to
p
-level merge driver
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
tes
t
: va
l
idate prer
e
quistes syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
Merge b
r
a
n
c
h 'mh/multimail-re
n
ewa
l
'
commit
|
commitdiff
|
tree
2015-04-28
Junio C H
a
mano
Merge b
r
anch 'mg/s
h
ow-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C
H
a
mano
Merge branch 'nd/
v
ersio
n
cmp-pre
r
e
leases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Ha
m
ano
Merge br
a
nch
'
mg/status-v-v'
commit
|
commitdiff
|
tree
next