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 'jn/makefile-cleanup'
2012-07-16
Junio C
Haman
o
Merge
b
r
a
nch
'jn/make
f
ile-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C H
a
mano
Merg
e
b
r
anch 'ar/clone-honor-
u
mask-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Junio
C
Ham
a
no
Merge branch
'
j
c/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Haman
o
Merge
br
a
n
ch 'cw/reba
s
e-i-
r
oot'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
i
o
C
Hamano
M
e
rge branch 'pw/git
-
p
4
-
m
ove'
commit
|
commitdiff
|
tree
2012-07-14
J
unio
C
Hamano
Merge branch 'pw/git-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C
H
aman
o
Merge
branch 'jk/
p
ush-delete
-
ref-error-message'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
Sixth batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branch 'jc
/
r
e
fa
c
tor-diff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branch
'tg/ce-n
a
melen'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branc
h
'tb
/
sa
n
itiz
e
-d
e
composed-
u
t
f
-8-
p
a
thname
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge br
a
nch
'mm
/
me
d
i
a
wiki-
t
ests'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
am
a
no
Merge branch
'
j
n/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Mer
g
e branch 'mm/mediawi
k
i-file-atta
c
h
m
ent
s
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
Hamano
Merge branch 't
r
/main
t
-s
h
o
w
-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
M
e
rge
bran
c
h 'mz/rebase-
n
o-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
m
a
no
R
educe
d
r
aft re
l
ease notes
to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Sync wi
t
h 1
.
7
.
1
1
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Git 1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio
C H
a
mano
Merge br
a
nch '
j
c/maint-blame-un
i
que
-
abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'rj/
p
latform-pread-may-
b
e-thread-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge b
r
anch 't
h
/di
f
f-no-index-fixes'
into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
ano
Merg
e
branch 'n
d
/c
l
one-sing
l
e-fix' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C
Hamano
Merge branc
h
'jc/rev-list-simplify-merges-fi
r
st-pare
n
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge
branch
'
h
v/s
u
b
module-updat
e
-nuke
-
s
ubmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ham
a
no
Merge branch 'jk/d
i
ff-no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
H
amano
Merge
b
ranch 'mm/ve
r
i
f
y
-
filenam
e
-fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io
C
H
a
mano
Merge
b
ranch 'cn/che
r
ry-pick-r
a
n
g
e
-docs'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
M
e
rge bra
n
ch
'
jc/ust
a
r
-
c
hec
k
sum
-
is
-
u
n
signed'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Merge branch 'jc/b
u
ndle-complete-
n
otice'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
Haman
o
Merge branc
h
'jc/ls-files-i-dir'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ha
m
a
n
o
M
er
g
e branc
h
'
j
c/reques
t
-pull
-
match-tagnam
e
'
into maint
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply:
tests for the --3w
a
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
rerer
e
: make
r
r-cache f
a
nout directory honor umas
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C Hamano
apply: document --3way
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
appl
y
: allo
w
rerere() t
o
work on
--
3
way
r
esu
l
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: register
c
onflicted
s
t
ages to the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hama
n
o
apply: --3w
a
y with
a
dd/add con
f
l
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
appl
y
: move verif
y
_
i
ndex_
m
atch()
hig
h
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply
:
plug
th
e
three-way m
e
r
g
e logi
c
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
app
l
y
:
f
a
ll bac
k
o
n
three-wa
y
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C H
a
man
o
appl
y
:
accept -3/--3way command
line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
an
o
apply: move "al
r
eady exi
s
ts" log
i
c t
o
c
h
eck_to_c
r
eate()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: move check_to_create_
b
l
ob() cl
o
ser to i
t
s sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
app
l
y:
furth
e
r sp
l
it loa
d
_preima
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
am
a
no
apply: refa
c
tor "previous patch" l
o
gic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
ano
a
p
ply
:
split loa
d
_preimage() helper
function ou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
apply: f
a
ctor
out checkou
t
_target()
h
elper fun
c
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
app
l
y
:
refactor read_file_or_gitlink
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hama
n
o
a
p
ply: clear_i
m
ag
e
() clears th
i
ngs a
bi
t
more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: a bit more comm
e
nts on PATH_TO_BE_DELETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply:
fix an i
n
complete
comment in ch
e
ck
_
pat
c
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rge gi
t
://
g
ithu
b
.
co
m
/git-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ham
a
no
Fifth batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Me
r
ge bra
n
ch 'cw/he
l
p-o
v
er-netw
o
rk'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Ha
m
ano
Merge branch 'mz/empty-rebas
e
-test'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
branch 'pw/git-p4-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
Merg
e
bra
n
ch '
j
s/fa
s
t-export-pat
h
s-with-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
b
r
a
nch 'cw/no-detaching-
a
n-unborn
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
Merge
b
ranch 'vr/use-our-perl-in-tes
t
s'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'mm
/
c
redential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
a
n
o
M
erge b
r
anch
'jc/main
t
-bla
m
e
-uni
q
ue-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'jn/perl-makemake
r
-lea
d
i
n
g-p
a
t
hs'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'rj/platfo
r
m-p
r
ead-may-be-thread-unsafe'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merg
e
b
r
anch
'
m
m
/confi
g
-xdg
'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C H
a
man
o
F
o
u
r
th b
a
tch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Ham
a
no
Merge branch 'nd/c
l
one-sin
g
l
e
-fi
x
'
commit
|
commitdiff
|
tree
2012-07-05
Junio
C
Ha
m
ano
M
e
r
ge
branch 'th
/
diff-n
o
-
ind
e
x-fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C
Hamano
Merge branch 'hv/remo
t
e-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Ham
a
no
Sync
with i18
n
-po updat
e
s in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
Junio C
Hamano
Merge bra
n
ch '
m
aint' o
f
git://github
.
com/git-l10n
/
git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Jun
i
o
C
Hamano
blame: compute a
b
breviation width
t
hat ensures
u
n
ique
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Ha
m
ano
di
f
f-
i
n
dex
.
c
: "git diff" has n
o
ne
e
d to
r
ead
b
l
o
b from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
u
n
i
o C Hamano
diff-i
n
de
x
.
c: unify handling of co
m
mand lin
e
paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
diff-index
.
c: do
not p
r
ete
n
d path
s
ar
e
pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C
Ham
a
n
o
T
h
ird
b
at
c
h
f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'fc/
g
i
t
-prompt-scr
i
p
t
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge branch 'js/submodule-r
e
lati
v
e
'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
M
erge b
r
anch 'lk/more-he
l
pful-st
a
tus-
h
ints'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hamano
Merge branch 'lk
/
rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'jc/rev-list-s
i
mplify-merg
e
s-first-par
e
nt'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Mer
g
e branch 'hv/submodule-update-nuke
-
su
b
modules'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hama
n
o
Merge branc
h
'nd/exclude-workaround-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ham
a
no
Merg
e
branch
'
nd/stream-pack-objects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge branch
'
nd/str
e
am-in
d
ex-pack'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge br
a
nch 'mm/verify-filena
m
e-f
i
x'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
Merge branch 'jk/diff-no
-
i
ndex-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Ham
a
no
ind
e
x-p
a
ck
:
Disable thre
a
di
n
g on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Seco
n
d batch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Haman
o
Me
r
g
e branch 'lp/no-cmd-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io
C
Hamano
Merge
b
ranch
'cn/cher
r
y
-pick-range-do
c
s'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
i
o
C
H
amano
Merge bran
c
h 'lm/
g
it-bla
m
e-el'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch '
r
s/ipv6-ssh-u
r
l'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
branch 'jc
/
ustar
-
c
h
e
c
k
s
um-is-unsigne
d
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
Merge branch 'rs/git-blam
e
-ma
p
c
a
r-ma
p
c'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branc
h
'
r
r
/d
o
c-co
m
mit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
M
e
rge branch 'nd/i18n-misc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge branch 'n
d
/i18n-branch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Me
r
ge branch 'jk/
n
o
-more-asciido
c
7'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
next