repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sg/completion-omit-credential-helpers' into next
2015-05-11
Junio
C Ham
a
no
M
e
rge branch 'sg/
c
omp
l
e
ti
o
n-omit
-
cre
d
en
t
ial-helpers
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
a
mano
Merg
e
b
ranc
h
'dl/branch-error-me
s
sage' into
next
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Sync with
master
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
Hamano
Merge
b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
i
o
C Hamano
S
ync 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 Ha
m
a
n
o
Me
r
ge br
a
nch 'mm/usa
g
e-l
o
g
-
l-can-
t
ake-regex'
int
o
maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'jc/diff-
n
o-index-d-f' into mai
n
t-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
amano
Merge branc
h
'oh/fix-config-de
f
ault
-
user-name-sec
t
ion
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e bra
n
ch 'jc/e
p
ochtime-wo-
t
z' into maint-2
.
3
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
S
econd bat
c
h for
2
.
5 cycle
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-11
Junio C H
a
mano
Merge
b
ranc
h
'pt/xdg-config-
p
ath'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Ha
m
an
o
M
erge branch 'ep/do-not-feed-a-pointer-to
-
array-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Mer
g
e branch
'jc/hash-
o
bjec
t
'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio
C Ham
a
no
M
erge branch 'sb/pr
e
fix-path-
f
ree-resu
l
ts'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
aman
o
M
e
rge branch 'sg/c
o
mpletion-n
o
-redundant
-
a
ll-command
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Ju
n
io
C
Haman
o
Merge branch 'sg/complete-decorate-full-not-long'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge
branch '
j
k/filter-branch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-11
Junio
C Hamano
Merge branch 'jc/d
a
emon-no-ipv6-for-2
.
4
.
1'
commit
|
commitdiff
|
tree
2015-05-11
J
u
ni
o
C
Hamano
Merg
e
br
a
nc
h
'jn
/
clean-use-er
r
or-n
o
t-
f
prin
t
f
-
on-stderr'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hamano
Merge
b
r
anch 'tb/blame-resurrec
t
-convert-to-g
i
t'
commit
|
commitdiff
|
tree
2015-05-11
Junio C
H
ama
n
o
M
e
r
ge branch
'
va
/
fix-git-p4-tests'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C H
a
mano
Merge bran
c
h '
l
d/p4-case-fold'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Me
r
ge branch '
j
k/rebase-quiet-noop'
commit
|
commitdiff
|
tree
2015-05-11
Junio
C
H
a
m
a
no
Mer
g
e
b
r
anch 'v
a
/p4-c
l
ient-path'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge bran
c
h 'mm/
a
dd
-
p
-
spli
t
-error'
commit
|
commitdiff
|
tree
2015-05-11
Juni
o
C
H
a
ma
n
o
M
e
rge branch 'tb/t0027-
c
rlf'
commit
|
commitdiff
|
tree
2015-05-11
J
u
nio C
Hamano
Merge branch 'ls/p4-chan
g
es-block-size'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Ham
a
n
o
M
e
rge
b
ranch 'jc/pl
u
g-fmt-merge-msg-le
a
k'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge br
a
nch 'nd/sl
i
m-i
n
dex-pac
k
-memory-usa
g
e'
commit
|
commitdiff
|
tree
2015-05-11
Jun
i
o C Hamano
Merge branch '
j
k
/
still-i
n
t
eres
t
ing'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
M
erge branch 'jk/re
a
ding-
p
acked-refs'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branc
h
'lm/squelch-bg-progress'
commit
|
commitdiff
|
tree
2015-05-11
J
unio C Hama
n
o
Merge
b
r
anch 'jk/sha1-
f
i
le-reduce-
u
seless
-
warning
s
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hama
n
o
Merge branch 'nd/multiple-work-trees
'
commit
|
commitdiff
|
tree
2015-05-11
Junio C Hamano
Merge branch 'pt/credential
-
xdg'
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
M
erge bra
n
ch 'pt/xdg-config-
p
ath'
i
nto next
commit
|
commitdiff
|
tree
2015-05-07
Junio C H
a
mano
Merge branch
'
e
p
/do-not-feed-
a
-poi
n
ter-to
-
ar
r
ay
-
size
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
Merge branch 'jc/
h
a
s
h-objec
t
'
in
t
o next
commit
|
commitdiff
|
tree
2015-05-07
Junio C
H
amano
Mer
g
e branch 'sb/pref
i
x-
p
ath-free-res
u
lts
'
into next
commit
|
commitdiff
|
tree
2015-05-07
Jun
i
o
C H
a
m
a
no
M
erge branch
'
sg/completion-n
o
-red
u
ndant-al
l
-comman
d
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C H
a
mano
Merge branch 'sg/co
m
pl
e
te-decorat
e
-full-not-long' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C
Hama
n
o
Merge
b
ran
c
h '
n
d/dwim-wildcards-as-pathspecs
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2015-05-07
Junio C
H
amano
M
e
r
ge branch 'jc/merge'
into nex
t
commit
|
commitdiff
|
tree
2015-05-07
Junio C Hamano
M
erge bran
c
h 'ph/rebase-
i
-re
d
o' i
n
to next
commit
|
commitdiff
|
tree
2015-05-07
Junio
C
Hamano
M
e
r
ge bran
c
h 'jk/filt
e
r-
b
ranch-use-of-sed-on-incomplete
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
mano
Merge branch
'tb
/
blame-resu
r
rect-c
o
nvert-to-git' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'jn/clean-use-
e
rror-not-fprintf-on-stderr
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Ha
m
ano
Merge
branch 'jc/daemon-no-ipv6-for-2
.
4
.
1' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hamano
Merge branch 'jc/test-prer
e
q-validate' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
aman
o
Merge bran
c
h
'bc/connect-plink' into next
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C
H
amano
Merge branc
h
'
j
k
/test-chain-lint' into
n
ext
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io
C
H
a
mano
Merge b
r
anch '
v
a/fix-git-p4-tests' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
M
erg
e
bran
c
h 'ld/p4-cas
e
-f
o
ld' in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Mer
g
e branch 'jk/reb
a
se-q
u
iet-noo
p
' in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Hamano
Merge branch
'fg/
d
ocument-co
m
mit-message-s
t
ripping
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C
Hamano
M
e
r
ge
b
ranch 'jk/stash-require-clean-inde
x
' into ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
H
a
m
ano
Merge branch 'jk
/
git-
n
o-mor
e
-argv0-path
-
mu
n
ging' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
M
e
rge
branch 'jc/gitignore-precedence' in
t
o next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
Merge branch '
t
b/t0027-crlf' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Junio C H
a
man
o
Mer
g
e bran
c
h
'va/
p
4-cli
e
nt-path' i
n
t
o n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C Ha
m
ano
Merge
b
ranch 'mm/add-p-
s
p
l
it-error' into n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge bran
c
h '
l
s/p4-ch
a
nge
s
-bl
o
ck
-
size'
i
nto n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
J
u
ni
o
C Ham
a
no
M
erge branch
'jc/plug
-
fmt-merge-msg-
l
eak'
i
nto
nex
t
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ham
a
no
M
e
rge
branch 'nd/slim-in
d
ex-
p
ack
-
memory-usage' into
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge branch 'jk/still-interesting'
into next
commit
|
commitdiff
|
tree
2015-05-06
J
unio C
H
amano
Merge branch '
j
k/read
i
ng-packe
d
-refs' int
o
next
commit
|
commitdiff
|
tree
2015-05-06
Junio
C
Hamano
Mer
g
e branch 'lm/squelch-bg-
p
rogress
'
i
n
to ne
x
t
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C
H
amano
Me
r
ge branch 'jk/s
h
a1-file-reduce-useless-warnin
g
s
.
.
.
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
H
amano
M
e
r
ge branch 'nd/multiple-wor
k
-trees' into next
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o
C Hamano
Me
r
ge
br
a
nch 'nd/diff-i-t-
a
' into next
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
branch 'p
t
/
c
redential-x
d
g' int
o
n
e
xt
commit
|
commitdiff
|
tree
2015-05-06
Jun
i
o C Hama
n
o
Fir
s
t
ba
t
ch for 2
.
5 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Ha
m
ano
Merge branch
'jk/prun
e
-
mtime'
commit
|
commitdiff
|
tree
2015-05-06
Juni
o
C
Ha
m
ano
Merge branch '
m
m
/usage-log-l-can-ta
k
e-regex'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge
br
a
nch 'ep/fix-test-lib-functions-report'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hamano
Merge
b
r
a
n
ch 'cn/bom-in-gitignore'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Haman
o
Merge branch 'jc/epo
c
htime-wo-tz'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
io C Hama
n
o
Merge
branch
'
nd
/
t1509-chro
o
t-test'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'oh/f
i
x-config-def
a
ult-user-
n
ame-
s
e
c
tion'
commit
|
commitdiff
|
tree
2015-05-06
J
unio C Hamano
M
e
rge branch
'jk/type-from-strin
g
-
ge
n
tly'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C
H
ama
n
o
M
erge branch 'sb/test-
b
itmap-free-at-en
d
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C
H
amano
Merge branch
'
ld
/
p4-file
t
y
p
e-detection
'
commit
|
commitdiff
|
tree
2015-05-06
J
un
i
o
C
H
a
mano
Merge
b
ranch 'ts/chec
k
o
ut-
a
dvice-plural'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Ha
m
ano
Merge branc
h
'jk/init-core-worktr
e
e
-at-
r
oot'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch
'
m
h
/show-br
a
nch-t
o
pic'
commit
|
commitdiff
|
tree
2015-05-06
Ju
n
i
o C Ha
m
an
o
Merg
e
bra
n
ch '
s
b/line-log-plug-pairdiff-le
a
k
'
commit
|
commitdiff
|
tree
2015-05-06
Junio C Hamano
Merge branch 'jc/diff-n
o
-
index-d-f'
commit
|
commitdiff
|
tree
2015-05-06
J
u
nio C Hamano
Merge branch 'bc/object-id'
commit
|
commitdiff
|
tree
2015-05-05
Jun
i
o C
H
ama
n
o
d
aem
o
n: u
n
break NO_IPV6 b
u
ild regression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-05-05
Junio
C
Hamano
w
rit
e
_sh
a
1_file(): do not use a sep
a
rate sha1[
]
a
rra
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-30
Junio C Hama
n
o
G
i
t
2
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio
C
Hamano
merge:
deprecate 'git
m
erge <mes
s
age> HEAD <c
o
mmit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
er
g
e: handle FETCH_HEAD
i
nternally
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hama
n
o
merge: de
c
ide if we au
t
o-generate
t
he
messa
g
e early
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Jun
i
o C Hamano
merge:
m
ake
c
o
llect
_
pare
n
ts() auto-generate the merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
mer
g
e:
e
xt
r
act pre
p
are_merge_messag
e
() logic out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Hamano
m
e
r
ge: narrow scope of
m
erge_n
a
m
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Junio C Haman
o
merge:
split
r
educe_paren
t
s
(
) out o
f
collec
t
_parents()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-04-29
Juni
o
C Hamano
merge: clarify colle
c
t_pa
r
ent
s
(
) logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next