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 branch 'dl/subtree-push-no-squash'
2015-05-22
Junio C
H
a
m
ano
Me
r
ge b
r
anch
'
dl/subtree
-
push
-
no-squash'
commit
|
commitdiff
|
tree
2015-05-22
J
unio C Hamano
Mer
g
e
branc
h
'sg/c
o
mpletion
-
om
i
t-credent
i
al-helpers
'
commit
|
commitdiff
|
tree
2015-05-22
Junio C Hamano
Merge bran
c
h 'dl/
b
ran
c
h-e
r
ror
-
m
es
s
age
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Third batch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-19
Junio
C
Hama
n
o
Merge branc
h
'
sb/r
e
f-lock-lose-lock-f
d
'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'kn/c
a
t
-
file-literally'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
H
amano
Merg
e
bra
n
ch 'nd/dwim-wildcards-as
-
pathspecs'
commit
|
commitdiff
|
tree
2015-05-19
Junio C
Hamano
Merge branch 'jc/
m
erge'
commit
|
commitdiff
|
tree
2015-05-19
Ju
n
io C Ham
a
no
Merge branch
'
ph/rebase-i-redo'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Hamano
Merge branch 'jc/tes
t
-pr
e
r
e
q-validate'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ha
m
ano
Merge b
r
a
nch 'bc/co
n
ne
c
t-plink'
commit
|
commitdiff
|
tree
2015-05-19
J
u
ni
o
C Hamano
Me
r
g
e bran
c
h 'jk/te
s
t-ch
a
i
n
-lint'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branc
h
'fg/document-
c
ommit
-
me
s
sag
e
-stripping'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
M
e
rge b
r
a
n
c
h
'jk
/
stash-require-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Merge b
r
anch 'jk/gi
t
-no
-
more-
a
rgv
0
-path-mu
n
ging'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hamano
Merge branch 'jc
/
g
i
ti
g
nore-preced
e
nce'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C
Hamano
Mer
g
e bra
n
ch
'nd/diff-i-
t
-
a
'
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Ha
m
ano
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 H
a
mano
Merg
e
branch 'sb/line-log-plug-pairdiff-leak' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o C
H
a
m
ano
Me
r
ge branch 's
b
/test-b
i
tmap-fr
e
e
-at-end'
into ma
i
nt
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Merge branch 'nd/t1509-chroot-
t
est' into maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Hama
n
o
Merge branch 'jk/type-fro
m
-st
r
i
n
g-gently' int
o
maint
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Ha
m
ano
Merge br
a
nch 'ep/fix-test-lib-functions-report' int
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branc
h
'cn
/
bom-in-gitign
o
re' into maint
commit
|
commitdiff
|
tree
2015-05-13
Juni
o
C Hamano
Mer
g
e branch
'jk/prune-mtime' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge branch 'jk/i
n
i
t-core-worktree-
a
t-root'
into m
a
int
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
m
ano
Merge
b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
S
y
n
c
w
i
t
h
2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
n
o
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
m
ano
M
erge branch 'mm
/
usage-log-l-can-take-
r
ege
x
'
i
nto
m
aint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'j
c
/di
f
f-no-inde
x
-d-f' int
o
m
a
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
M
e
r
g
e
branch 'oh/fix-config-def
a
ult-us
e
r-name-s
e
ction
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
n
i
o C Hamano
Me
r
g
e branch
'jc/
e
p
o
chtime-wo
-
tz' into
m
aint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Secon
d
b
atch for 2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
H
a
m
ano
Mer
g
e bra
n
ch '
p
t/xdg-config-path'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C H
a
mano
Merge branch 'ep/do-not-feed-a-poi
n
ter-to-array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge
branch
'
jc/hash-obje
c
t'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'sb/pr
e
f
i
x-path-free-
r
e
sults'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Hamano
Merge
b
ranch 'sg/completion-
n
o-redundant-al
l
-co
m
mand
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
unio C H
a
ma
n
o
Merge b
r
anch 'sg/complete-d
e
cor
a
t
e
-ful
l
-
n
ot-long'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
Merge bran
c
h 'jk/fil
t
er-br
a
nch-use-of-sed-on-incompl
e
te
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge branch '
j
c/daemon-no-i
p
v6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ham
a
n
o
Merge
br
a
nc
h
'jn/cl
e
an-use-e
r
ror-not
-
fprintf-on-stderr
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Me
r
g
e bran
c
h 't
b
/
b
lame-r
e
surrect
-
c
o
n
vert-
t
o-git'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hamano
Merge
b
ranch 'va/fix-git-p4
-
tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge
branch
'
l
d/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hama
n
o
M
erg
e
branch 'jk/reba
s
e-quie
t
-noop'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Ha
m
ano
Merge branch 'va/p4
-
client-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Hamano
Me
r
ge b
r
anch 'm
m
/
a
d
d
-p
-
split-
e
r
r
or'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge branch 'tb
/
t0
0
27-crlf'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Me
r
ge branch 'ls/
p
4
-
changes-block-
s
ize'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hama
n
o
Mer
g
e bra
n
ch
'
jc/plug-fmt-
m
e
rge-msg-leak'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Ha
m
ano
Merge branc
h
'
n
d/
s
lim
-
i
n
dex-pack-me
m
ory-
u
sage
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
no
Merg
e
branch 'jk/still-interes
t
ing'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
e
rge branch 'jk/readi
n
g-packed-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranc
h
'lm/squelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch
'
j
k
/sh
a
1-file-re
d
u
ce-usele
s
s-war
n
ing
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge b
r
anch 'nd/mul
t
i
ple-wor
k
-
trees'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch
'pt/cred
e
ntial-
x
dg'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
First
b
a
t
ch for
2
.
5
cy
c
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
b
ranc
h
'
j
k/prune-mt
i
me'
commit
|
commitdiff
|
tree
2015-05-06
J
uni
o
C Hamano
Merge branch 'mm/us
a
ge-log-
l
-ca
n
-take-rege
x
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Ham
a
no
Merge
b
r
anch 'ep/fix-t
e
s
t
-lib-function
s
-r
e
port'
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o
C Hamano
Merge
b
ranch 'cn/bom-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
Merge branch 'jc/epoch
t
ime-wo-t
z
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge
branch 'nd/t150
9
-
chroot-t
e
st'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
am
a
n
o
M
e
rge branc
h
'oh
/
fix-co
n
fig-de
f
aul
t
-u
s
e
r-name-
s
ection'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge branch 'jk/type-from-string-g
e
nt
l
y'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
M
erge branch '
s
b/test-bitmap-free-at
-
e
nd'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C
H
a
mano
Merge branch 'ld/p4-filetype-detection'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio
C
H
a
ma
n
o
Mer
g
e
branch 'ts/
c
hec
k
out-advice-plura
l
'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
amano
Mer
g
e br
a
nch 'jk/init-core-worktr
e
e
-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branch 'mh/show-branch-topic'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'sb/line
-
log-pl
u
g
-pairdi
f
f-leak'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C
H
ama
n
o
Mer
g
e
branch 'jc/diff-no-index-d
-
f'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hama
n
o
Merge bra
n
ch 'bc/o
b
je
c
t-id'
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C Hamano
daemon: unbreak NO
_
IP
V
6 buil
d
regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Juni
o
C Hamano
write_sha1_file():
d
o not use a separa
t
e sha1[] array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio
C Ha
m
ano
Git
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
r
g
e: deprecate 'git merge <message
>
HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C
H
amano
merge
:
handle FETCH_HEAD internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
mer
g
e:
de
c
ide if we auto-generate the message early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
unio C Hamano
merge
:
make collect_parents() auto
-
g
enerate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
a
mano
m
e
r
g
e: extract prepare_merge_
m
essage() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
g
e
: narrow scope of me
r
ge_na
m
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ham
a
no
merge: split reduce_parents(
)
out of collect_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio C Hama
n
o
m
erge: clarify collect_parents
(
) l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
uni
o
C
H
a
mano
merge: small leakfi
x
and code simp
l
ificati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: do not check argc to determine
n
umber of re
m
ote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
Hamano
merge: cl
a
rify "pulling i
n
to void"
special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
amano
t5520: t
e
st pulling an oc
t
op
u
s
i
nto an u
n
born b
r
a
n
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
t
5
5
20: style
f
ixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
H
a
mano
mer
g
e: simplify code fl
o
w
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
nio
C
Hamano
m
e
rge: test the top-level
merge driv
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C Hamano
test: va
l
ida
t
e prer
e
quiste
s
sy
n
tax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-28
Junio
C
Hamano
M
e
rge b
r
anch 'm
h
/multimail-renewal'
commit
|
commitdiff
|
tree
2015-04-28
Ju
n
io C Hamano
M
erge branch 'mg/s
h
ow-notes-doc'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hamano
M
erge branch 'nd/versioncm
p
-pre
r
e
l
e
ases'
commit
|
commitdiff
|
tree
2015-04-28
Junio C Hama
n
o
M
e
rge
b
ranch
'
mg/status-v-v'
commit
|
commitdiff
|
tree
next