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/commit-cleanup-scissors' into next
2015-06-16
J
u
n
io C Hama
n
o
Merge branch 'sg/commit-clean
u
p
-
s
cissors' in
t
o next
commit
|
commitdiff
|
tree
2015-06-16
Jun
i
o
C Ha
m
ano
Merge branch
'jk/index-pack
-
reduce-recheck' into next
commit
|
commitdiff
|
tree
2015-06-16
Junio C
H
amano
M
e
rge
b
r
a
n
ch 'af/tcsh-comp
l
etion-nocl
o
bber' into next
commit
|
commitdiff
|
tree
2015-06-16
J
u
n
i
o
C Ham
a
no
Me
r
ge branch '
m
h
/
r
e
p
or
t
ing-broken-refs-from-
f
or-each
.
.
.
commit
|
commitdiff
|
tree
2015-06-16
J
u
nio C Hamano
Merge branch 'sg/completion-c
o
mmi
t
-cleanup'
i
n
to
next
commit
|
commitdiff
|
tree
2015-06-16
Junio C Ham
a
no
Merge
b
ranch 'pt
/
a
m-abort-fix' i
n
to next
commit
|
commitdiff
|
tree
2015-06-16
Jun
i
o C Hamano
Merg
e
bran
c
h
'
n
d/untra
c
ked-cache'
i
n
to
n
ext
commit
|
commitdiff
|
tree
2015-06-16
Ju
n
io C
Ha
m
ano
Merge branch 'm
h
/fsck-reflog
-
en
t
ries' into n
e
xt
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge b
r
anch 'master' into n
e
xt
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C Hamano
Me
r
ge branch 'js/sleep-without-select' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge
b
ranc
h
'es/u
t
f8-stupid-co
m
piler-wo
r
ka
r
ou
n
d'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C
Hamano
M
e
r
g
e
br
a
nch
'rl/am-3way
-
config' int
o
next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
n
o
Merge bra
n
ch 'jc/ll-me
r
ge
-
e
x
pose-path'
into next
commit
|
commitdiff
|
tree
2015-06-11
Junio C H
a
mano
Merge branch '
e
s/osx-header-pollut
e
s-mask-macro' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hamano
Me
r
ge
branch 'e
s
/conf
i
gure-ge
t
delim' i
n
to next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
no
M
erge branch '
p
t/
p
ull-optp
a
rse' into next
commit
|
commitdiff
|
tree
2015-06-11
J
u
n
io C Haman
o
M
e
r
g
e branch 'qn/blame
-
show-email' into next
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hamano
Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks
.
.
.
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
Merge bran
c
h '
e
s/send-em
a
il-
s
endmail-alias' into
n
e
x
t
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
Merg
e
branch 'jc/appl
y
-
r
eje
c
t-noop-hunk' into n
e
xt
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o
C
H
amano
S
e
cond half of seventh bat
c
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
no
Merg
e
bra
n
ch 'tb/com
p
lete-sequencing'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Ham
a
no
Merg
e
branch 'jk/squelc
h
-mis
s
ing-
l
ink-wa
r
ning-for-unrea
c
hable'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C Hamano
Me
r
ge branch 'pt/p
u
ll-te
s
ts'
commit
|
commitdiff
|
tree
2015-06-11
Juni
o
C H
a
mano
Me
r
ge
branch 'sb/glossary-submodule'
commit
|
commitdiff
|
tree
2015-06-11
Ju
n
io C Hama
n
o
Merge
b
ranch 'sb/submodule-
d
o
c-intro'
commit
|
commitdiff
|
tree
2015-06-11
Jun
i
o C
Ha
m
ano
Merge branch '
j
k/diagnose
-
conf
i
g-
m
map-failu
r
e'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
H
a
man
o
Merg
e
branc
h
'mt/p4-depotFile-at
-
ver
s
i
o
n'
commit
|
commitdiff
|
tree
2015-06-11
Junio
C
Hama
n
o
Merg
e
b
ra
n
c
h
'mh/ve
r
ify-lock-erro
r
-
r
eport'
commit
|
commitdiff
|
tree
2015-06-11
J
u
nio C Hama
n
o
Merge
bra
n
ch 'jk/color-di
f
f
-plain-is-conte
x
t
'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Haman
o
Merge br
a
nch
'
jk/clone-dissociate'
commit
|
commitdiff
|
tree
2015-06-11
Junio C Hama
n
o
Mer
g
e branch 'jc
/
diff-ws-e
r
ror-
h
i
ghlight
'
commit
|
commitdiff
|
tree
2015-06-09
Jeff
King
inde
x
-
p
ack: avoid
e
xcess
i
ve re-reading
o
f pack directory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-09
SZ
E
DER Gábor
commit: c
o
p
e wi
t
h s
c
issors lines in co
m
mit messag
e
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-09
Ariel Fai
g
o
n
git
-
completion
.
t
c
sh: fix red
i
rect
w
ith noclobber
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Pau
l
T
an
am --abort: k
e
ep unr
e
lated commits on unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am --abort: support aborti
n
g to unbor
n
br
a
nch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am
-
-abort: revert c
h
anges
i
ntro
d
uced by fa
i
led
3way
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul
T
an
am --ski
p
: support
s
k
ip
p
ing
while on unborn branch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Tan
am
-
3: support
3way merge on unbo
r
n
b
ranch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Paul Ta
n
am -
-
ski
p
:
r
eve
r
t changes introduc
e
d by failed 3way
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Mic
h
ael
Ha
g
gerty
fsck: re
p
o
rt e
r
rors if reflog ent
r
ies poin
t
a
t
invalid
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Michael Hagger
t
y
fsck_han
d
l
e_
r
eflog_s
h
a1(): new
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Michael
H
aggerty
r
ead_lo
o
se_refs():
treat NUL
L
_SHA1 loo
s
e refer
e
nces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
Nguyễn Th
á
i Ngọc Duy
read-cache: fix untrack
e
d
cache invalid
a
t
ion when split
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-08
SZED
E
R Gábor
comp
l
e
t
ion:
t
each 'scissors' m
o
de to 'git commi
t
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Eric
S
unshine
utf8: NO_ICONV: sile
n
ce uninitialized variable
w
arni
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Johannes Sixt
lockfile: wait using sleep_mill
i
s
ec() instead
of se
l
ect()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Joha
n
nes Sixt
lock
f
ile: convert retry timeout co
m
puta
t
io
n
s to
millisecond
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Johannes Sixt
help
.
c: wrap wait-only
p
o
l
l() inv
o
c
a
t
i
o
n
in sleep_millisec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Johann
e
s Sixt
l
o
ckfile: replace random() by
r
an
d
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Sync with master
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C
Hamano
Sync
w
ith 2
.
4
.
3
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o
C
Haman
o
Git 2
.
4
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
The fir
s
t half of the seventh batch for 2
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
a
no
Merge branc
h
'ld/p4-ed
i
tor-multi
-
word
s
'
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
mano
Merge branch 'bc/obj
e
ct
-
id'
commit
|
commitdiff
|
tree
2015-06-05
Junio C Ha
m
ano
Merge branch 'jk/at
-
push-sha
1
'
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
io C
Ham
a
no
Mer
g
e branch 'dl/branch-err
o
r-message' int
o
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
bra
n
c
h 'jk/sk
i
p-http-te
s
ts-
u
n
der-n
o
-
c
u
r
l' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Mer
g
e branch 'ps/doc-pac
k
f
ile
-
vs-pack-file' i
n
to
maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Hamano
M
erge
bran
c
h 'fg/docum
e
nt
-
co
m
m
i
t
-
m
e
ss
a
ge-s
t
r
i
pping
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
H
a
m
ano
Merge
b
ran
c
h '
j
k/
r
erere-forget-chec
k
-enable
d
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Juni
o
C H
a
m
a
no
Merg
e
branch
'
p
t
/pull-log
-
n' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio
C H
a
mano
M
e
rge branc
h
'pt/pull-ff-vs-merge-f
f
' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
J
unio C Hamano
Merge branch 'rs
/
plu
g
-leak-in-pack-
b
itmaps'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
Merge branc
h
'ja/tutorial-a
s
c
iidoctor-fix' into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Haman
o
M
erge branch
'
jk/stripspa
c
e-asci
i
doc
t
or
-
fix'
i
nto
m
aint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hama
n
o
M
e
rg
e
branch 'jk/asciidoc-
m
arkup-fix'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'ps/bundle-verify-arg'
into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge branch 'mh
/
write-r
e
fs-sooner-2
.
4'
in
t
o m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
Merge
b
ranch 'mh/ref
-
direc
t
ory-file' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hama
n
o
Merge branch 'mg/log-
d
e
corate-HEAD' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merge branc
h
'sb/t
1
020-
c
lea
n
up' into ma
i
nt
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio
C
Hamano
Merge branch 'jc/gitign
o
re-pr
e
cedence'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hamano
M
erge branch '
b
c/conne
c
t-pli
n
k' into maint
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Merg
e
branch
'
ph
/
rebase
-
i-redo' int
o
m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio
C
Hama
n
o
Merge branch 'jk/add-e
-
k
ill-ed
i
t
o
r
'
into mai
n
t
commit
|
commitdiff
|
tree
2015-06-05
Junio
C Ham
a
no
Merge bra
n
ch 'mh/clone-verbosit
y
-fix
'
into maint
commit
|
commitdiff
|
tree
2015-06-05
Ju
n
i
o
C
Hamano
Merge branch 'jk/sha1-
f
ile-reduce-useles
s
-
warn
i
ngs
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
Jun
i
o C Hamano
M
e
r
g
e br
a
nch
'
tb/
b
lame-resurrect-convert-
t
o-git
'
into
.
.
.
commit
|
commitdiff
|
tree
2015-06-05
J
u
nio C Hamano
Mer
g
e bra
n
ch 'jc/pl
u
g
-
fmt-merge-msg
-
leak' into m
a
int
commit
|
commitdiff
|
tree
2015-06-05
Junio C Hamano
Merge
b
ranch
'
pt/xdg-confi
g
-path' into m
a
int
commit
|
commitdiff
|
tree
2015-06-04
Junio C Ha
m
ano
ll-merge: pass t
h
e ori
g
in
a
l path to exte
r
nal drivers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
J
u
nio
C
H
amano
Merge
b
ran
c
h 'nd/
s
lim-index-pack-
m
emory-usage' into
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Jun
i
o
C Ham
a
no
Merge bran
c
h 'sb/
p
ack-proto
c
o
l-m
e
ntio
n
-smart-http'
.
.
.
commit
|
commitdiff
|
tree
2015-06-04
Junio C Ha
m
ano
Merge
branc
h
'jk/make-fix-dependencies' into next
commit
|
commitdiff
|
tree
2015-06-04
Junio C
H
amano
Merg
e
branch 'jk/die-on-bogus-worktree-la
t
e' into next
commit
|
commitdiff
|
tree
2015-06-04
Junio C Haman
o
Me
r
ge
branch '
s
g/merge-summa
r
y-co
n
fig'
i
n
to nex
t
commit
|
commitdiff
|
tree
2015-06-04
J
un
i
o C H
a
ma
n
o
Mer
g
e
branch 'ah/send-email-sendmail-alias'
i
nto next
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
git-am:
add am
.
threeWay config v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi Les
p
inet
t4150-am: refactor am -
3
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
Remi Lespinet
git-am
.
sh: fix initialization o
f
the threeway varia
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-04
J
e
ff King
ind
e
x-pack: fix truncation o
f
o
f
f
_
t in comparison
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Michael
H
aggerty
read_lo
o
se_refs(): si
m
plify function
l
og
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eri
c
Su
n
shine
c
o
nfigure: add getdelim() check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eric S
u
nshi
n
e
confi
g
.
mak
.
u
n
ame
:
Darwin: define
HA
V
E_GETDELIM for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Jeff King
e
w
a
h:
u
se
l
ess g
e
neric macro name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-03
Eri
c
Su
n
shine
ewah/bitma
p
: silence warn
i
n
g about MASK macro
re
d
efinition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2015-06-02
Stefan Beller
Doc
u
mentati
o
n/
t
e
c
hnical/pa
c
k-protocol: mention http
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next