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 'jc/merge'
2015-05-19
Junio C Ham
a
no
Merg
e
branch
'
jc/merge'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio C Ham
a
no
M
e
rge bra
n
ch 'p
h
/rebas
e
-i-re
d
o
'
commit
|
commitdiff
|
tree
2015-05-19
J
u
nio
C
Ha
m
ano
Merge branch '
j
c/te
s
t-prer
e
q
-
val
i
d
a
te
'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C
H
amano
Merge
bra
n
ch
'bc/connect-p
l
i
n
k'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Hama
n
o
Mer
g
e bra
n
c
h 'jk/test-chain
-
lint
'
commit
|
commitdiff
|
tree
2015-05-19
J
unio C Hamano
Merg
e
branch 'fg/document-c
o
m
mit-mess
a
ge-st
r
ip
p
ing'
commit
|
commitdiff
|
tree
2015-05-19
J
un
i
o C Hama
n
o
M
e
rge branch 'j
k
/
s
tash-req
u
ire-clean-index'
commit
|
commitdiff
|
tree
2015-05-19
Junio C Ha
m
ano
Merge branch 'j
k
/git-no-more-ar
g
v0-path-mu
n
ging'
commit
|
commitdiff
|
tree
2015-05-19
Juni
o
C Ha
m
ano
M
e
rg
e
bran
c
h 'jc/gitig
n
ore
-
preceden
c
e'
commit
|
commitdiff
|
tree
2015-05-19
Jun
i
o
C Hamano
Merge branch 'nd
/
diff
-
i-t-a'
commit
|
commitdiff
|
tree
2015-05-13
Ju
n
io C Hama
n
o
Sync with
2
.
4
.
1
commit
|
commitdiff
|
tree
2015-05-13
Jun
i
o
C
Hamano
Git 2
.
4
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-13
J
u
nio C Haman
o
Merge
bra
n
ch 'sb/line-log-plug-pairdiff-leak' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Haman
o
Merge
b
r
a
nch 'sb/
t
est-bit
m
ap-
f
ree
-
at-end
'
into maint
commit
|
commitdiff
|
tree
2015-05-13
J
uni
o
C
Haman
o
Merge b
r
anch 'nd/t1509-
c
hroot-te
s
t
'
into
m
aint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Haman
o
Merge branch 'jk/type-from-
s
tring-gently
'
in
t
o m
a
i
n
t
commit
|
commitdiff
|
tree
2015-05-13
J
u
n
i
o
C Hamano
M
erge branch 'ep/fix-test-lib-fu
n
ctions-report' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-13
Junio C Ha
m
ano
Merge
b
ranch 'cn/bom-i
n
-gitigno
r
e
' in
t
o maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
M
erge branch
'
jk/prune-mtim
e
'
i
n
to maint
commit
|
commitdiff
|
tree
2015-05-13
Junio C Hamano
Merge br
a
nch 'jk
/
init-core-
w
orktree-at-
r
o
o
t' into maint
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io
C Ha
m
ano
S
y
nc with 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
Hamano
Git 2
.
3
.
8
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'mm/usage-lo
g
-l-c
a
n
-
t
ake-r
e
gex' in
t
o
main
t
-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Hama
n
o
Merge
b
ran
c
h 'jc/diff-no-index-d-f' into ma
i
nt-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
M
e
rge branch 'oh/
f
ix-confi
g
-
d
ef
a
ult-user-name-secti
o
n
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ha
m
a
n
o
Me
r
ge branch 'jc/epochtime-wo-tz
'
in
t
o
main
t
-
2
.
3
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C H
a
mano
S
e
cond batch for 2
.
5 c
y
cle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
am
a
no
Mer
g
e branch 'pt/xdg-confi
g
-path'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Hamano
Merge branch
'e
p
/do-not-fee
d
-a-pointe
r
-
t
o
-arr
a
y-
s
ize'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Merge
b
ranch 'jc/hash
-
object'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merge bra
n
ch 'sb/pr
e
fix-path-free-results'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Me
r
ge branch 'sg/completio
n
-
n
o-redu
n
dant-all-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Hamano
Mer
g
e
b
ranch 'sg/complete-dec
o
rate-f
u
ll-not-
l
ong'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io C Hamano
Merg
e
branch 'jk/filter-branch-use-of-sed-on-inco
m
plete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
M
e
r
ge b
r
anch 'jc/da
e
mon-no-
i
pv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Merg
e
branch 'jn/cl
e
a
n-u
s
e-error-not-fprint
f
-on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge
b
r
a
nch 'tb/blame-
r
e
s
urrec
t
-convert-to-git'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Me
r
ge
b
r
anc
h
'va/fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
a
mano
Merge branch 'ld/p4-c
a
se
-
fold'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o
C Hamano
M
e
rge bran
c
h 'jk
/
re
b
ase-
q
uiet-no
o
p'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C Hamano
Merge br
a
nch 'va/p
4
-client-
p
ath'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Haman
o
Merge
b
r
a
nch 'mm/add-p-split-error'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch 'tb/t0027-
c
rlf'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
Ha
m
ano
Merg
e
b
r
anch
'ls/p4-changes-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Ham
a
no
Merge branch 'jc/p
l
ug-fmt-merge
-
msg-l
e
ak'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C Ha
m
ano
Merge b
r
anch 'nd/sl
i
m-index
-
pack-
m
emory-usag
e
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merg
e
branch
'
jk/s
t
ill-
i
nteres
t
in
g
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge
b
ra
n
ch 'jk/reading-pa
c
ked-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
amano
Me
r
ge branch '
l
m/squelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge branch
'jk/sha
1
-file-reduce
-
use
l
es
s
-w
a
rn
i
ngs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
b
ranch '
n
d
/
multiple-
w
ork-trees'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C Haman
o
Mer
g
e branch 'pt
/
cr
e
dential-xdg'
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
path
.
c: r
e
move home
_
config_paths
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
git-
c
onfig:
replace use
o
f home_con
f
ig_p
a
t
h
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Pa
u
l T
a
n
git-commit: r
e
place use of h
o
me_conf
i
g
_pa
t
hs()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
cr
e
dential-
s
tore
.
c: replace home_
c
onfig_paths() with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul
Tan
dir
.
c:
r
e
p
lac
e
home_config_p
a
t
hs() with xdg_config_home()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
P
a
ul Tan
attr
.
c: replace
home_config_paths
(
) with x
d
g_
c
onf
i
g_
h
o
m
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Paul Tan
p
a
th
.
c: impl
e
ment xdg_config_home()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
First batc
h
for 2
.
5
cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge branch 'jk/prune-
m
time'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Mer
g
e bra
n
ch 'mm/usage-log-l-can-take-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bra
n
ch
'ep/fix-test-lib-functions-re
p
ort'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge branc
h
'cn
/
bom-in-gi
t
ignore'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Ham
a
n
o
Me
r
ge branch '
j
c
/
epo
c
hti
m
e-wo-tz
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Haman
o
Merge branch 'nd/t
1
509-chroot-tes
t
'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch 'oh/fix-
c
onfig-default-user-name-section
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
an
o
Merge
branch 'jk
/
type
-
from-string-ge
n
t
ly'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge branch
'
s
b
/test-bitmap
-
free-at-end'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
Merge
branch 'ld/p
4
-filetyp
e
-detection'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge b
r
a
n
ch 'ts/checkout-advice-
p
lural'
commit
|
commitdiff
|
tree
2015-05-06
J
u
n
io C
H
a
m
ano
M
e
rge branch
'jk/init-co
r
e-worktree-at-root'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Me
r
g
e
b
ra
n
ch 'mh/show-b
r
a
n
c
h
-
t
o
pic'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Hamano
Me
r
ge br
a
nch 'sb/line-log
-
plug-pairdi
f
f-leak'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Me
r
ge branch 'j
c
/diff-no-ind
e
x-d-f'
commit
|
commitdiff
|
tree
2015-05-06
Junio
C Hama
n
o
Merge branch '
b
c/object-
i
d'
commit
|
commitdiff
|
tree
2015-05-05
Eli
a
Pinto
git
-
compat-util
.
h: implement a differe
n
t ARR
A
Y_SIZE
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio
C
Ha
m
ano
daemon:
u
nbreak NO_IPV6 b
u
ild reg
r
ession
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Stefan Belle
r
prefix_path()
:
un
c
onditional
l
y free results
i
n the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio C Ha
m
ano
writ
e
_sha1_file(): do not use a separate
s
ha1[]
array
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
E
ric Sunshine
t1007:
a
dd has
h
-object
--literally test
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
E
ric Sunshine
hash-object --literall
y
:
fix b
u
f
fer
o
verru
n
with extra
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
Jonatha
n
Nieder
config:
u
se
e
r
ror() i
n
s
t
ead of fprintf(stderr,
.
.
.
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-04
Eric Sunshine
git
-
ha
s
h-
o
bject
.
txt: document
-
-literal
l
y option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
SZEDER Gábor
complet
i
on: fix an
d
update 'git log --decorate=' op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
S
Z
E
D
E
R Gábor
complet
i
on:
remove redun
d
a
nt
_
_git_
c
om
p
ute_all_commands
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-03
Torsten Bögershausen
blame: CRLF in the working tr
e
e and LF in the repo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
J
u
n
io C
Ha
m
ano
G
it 2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C
H
amano
merge: deprecate 'gi
t
merge <mess
a
ge> HEAD <commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
J
u
n
io C Ha
m
ano
merge
:
han
d
le FETCH_HEAD internally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Ha
m
ano
merge: d
e
c
i
de
i
f
w
e
auto-gener
a
t
e
t
he messag
e
early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o
C
H
am
a
no
merge
:
make col
l
ect_parents
(
) auto-gene
r
ate
the merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Hamano
merge: extract prepare_merge_message() logic
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
me
r
g
e
: narrow scop
e
of merge_names
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Ju
n
io C Haman
o
me
r
ge: split re
d
uce_parents() o
u
t of co
l
lec
t
_pa
r
ent
s
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge: clari
f
y colle
c
t_parents() logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
merge
:
smal
l
leakfix and c
o
d
e s
i
mplification
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Ha
m
ano
m
e
r
ge:
d
o
not check argc to determine number of remote
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge:
clari
f
y "pulling into voi
d
"
special case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next