repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/maint-commit-amend-only-no-paths'
2012-07-16
Junio C Hama
n
o
Merge bran
c
h
'
j
k/maint-com
m
it-amend-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
ran
c
h 'cw
/
a
mend-co
m
mit-without-message'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C H
a
mano
M
erge branch 'jn
/
makefile
-
cleanu
p
'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
H
a
mano
Merge branch 'ar/clone-honor-
u
ma
s
k
-at
-
top'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Haman
o
Merg
e
branc
h
'
j
c/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e
branch 'cw/rebase-i-root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'pw/gi
t
-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Haman
o
Mer
g
e branch 'pw/git
-
p
4
-jobs
'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hama
n
o
Merge branch 'j
k
/pu
s
h-delete-ref-error-mes
s
age'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixth b
a
tch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'jc/refactor-diff-std
i
n
'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
amano
M
e
r
g
e
br
a
nch 'tg/ce-name
l
e
n'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Hamano
Merg
e
branch '
t
b/san
i
tize-dec
o
mposed-utf-8-pathname'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge
branch '
m
m/mediawi
k
i-test
s
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Mer
g
e
branch 'j
n
/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Merge bra
n
c
h 'mm/media
w
ik
i
-
f
ile-a
t
tachments
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
r
ge branch 'tr
/
maint
-
show-wal
k
'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Haman
o
Merge branch '
m
z
/
reb
a
se-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
mano
Redu
c
e draft
release notes to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hama
n
o
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Git 1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'jc/
m
aint-blame-
u
nique-abbrev
'
into main
t
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
Merg
e
branch '
r
j/platform-prea
d
-may-
b
e
-
thread-unsa
f
e
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
aman
o
Merge bra
n
ch '
t
h/diff-no-index-fi
x
es' into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bran
c
h 'nd/
c
lon
e
-sing
l
e
-
fix' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch
'
jc
/
rev-list-simplify-merge
s
-
first-pa
r
ent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
C Hamano
M
er
g
e branch 'h
v
/submodul
e
-update-nuke-su
b
m
o
dules
'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
rge
bra
n
ch 'j
k
/diff
-
no-index-pager' into maint
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C H
a
m
ano
M
e
rge
br
a
nch 'mm
/
verify-fil
e
name-f
i
x' in
t
o main
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Mer
g
e branch 'cn/cherry-pick-range-
d
ocs
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge br
a
nch 'jc
/
ust
a
r-checksum-is-un
s
i
gned' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge bra
n
ch 'j
c
/bundle-compl
e
te-not
i
ce' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'jc/ls-files-i-d
i
r' into maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
a
m
ano
Merge branch 'jc/request-
p
ull-match-t
a
gname
'
int
o
mai
n
t
commit
|
commitdiff
|
tree
2012-07-10
Junio C
H
amano
apply
:
t
e
sts
fo
r
the --3way o
p
ti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
uni
o
C
H
a
mano
rerere: make rr-cache f
a
n
out directory
honor u
m
ask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
apply: docu
m
e
nt
-
-
3
way o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
pply:
a
llow re
r
ere() t
o
w
ork
on --3way resul
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
apply:
register conflicte
d
stages to the i
n
dex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: --3way with add/add conf
l
ict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
app
l
y: m
o
ve verify
_
index_matc
h
(
)
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
p
lug
t
h
e th
r
ee-way merg
e
log
i
c in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
Hamano
apply: fall back
o
n three-w
a
y merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C H
a
mano
apply
:
accep
t
-3/--3w
a
y
c
ommand line
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: mov
e
"alrea
d
y ex
i
sts" lo
g
ic to
c
heck_to_create
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
m
ano
ap
p
l
y: move check
_
to_c
r
eate_
b
lob() closer to its sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
appl
y
: further split load_pr
e
i
mage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: refactor "pre
v
ious patch" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Ha
m
ano
apply: split load_preim
a
ge() he
l
per function o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
p
p
ly
:
factor out ch
e
ckout_ta
r
get() helper functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply:
r
e
factor read_fil
e
_or_gitlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
apply: clear_image() cl
e
ars things a b
i
t mo
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ham
a
no
apply:
a b
i
t more
c
omment
s
o
n PATH_TO_BE_DELETE
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
apply: fix an incomplete
comment in
check_pat
c
h
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Ha
m
ano
M
e
rge git://
g
ithub
.
c
om/
g
it-l10n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
Fifth ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Hamano
M
e
rge br
a
nch
'cw/help-over-
n
e
t
work'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Me
r
ge b
r
anch 'mz/empty
-
r
ebase-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge b
r
anch 'pw/git-
p
4-tes
t
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hama
n
o
Merge branch 'js/fa
s
t-export-paths-with-s
p
aces'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C
Haman
o
M
er
g
e branch 'cw/no-de
t
achin
g
-an-unbo
r
n'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge branch 'vr/use-our-perl-in
-
tests'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
Merge bran
c
h '
m
m/c
r
edential-p
l
u
mbing'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
M
e
rge br
a
n
c
h
'
jc/
m
aint-blame-
u
nique-
a
bbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
Me
r
ge bra
n
ch 'j
n
/
p
erl-makemaker-leading-
p
aths'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hama
n
o
Merge branch 'r
j
/
platfor
m
-pr
e
a
d-ma
y
-
b
e-th
r
ead-u
n
saf
e
'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
Merge
b
r
anch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
no
Fourth batch f
o
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Haman
o
Mer
g
e branch 'nd/clone-single-
f
ix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ham
a
no
Me
r
ge br
a
nch 'th/diff-
n
o-inde
x
-fix
e
s'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
M
erg
e
branch 'hv/
r
emote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
Ju
n
io C Haman
o
Sy
n
c
with i1
8
n
-
po updates in maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
J
u
nio C Haman
o
M
e
rge branch 'maint' o
f
git://github
.
com/git-l10n
/
g
i
t
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
b
l
am
e
: compute abb
r
eviatio
n
width that ensures
uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
aman
o
di
f
f
-
index
.
c: "
g
it
diff" has no n
e
ed to read blob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C
H
amano
diff-index
.
c: unify handlin
g
of c
o
mmand line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Hamano
diff-index
.
c: do not pretend pa
t
hs ar
e
pa
t
h
s
pecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C
H
amano
Th
i
rd batch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch
'fc/
g
it-prom
p
t-s
c
r
i
pt'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'js/submodule-re
l
ative'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge b
r
anch '
l
k/
m
or
e
-helpful-status-hints'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Haman
o
Merge branch 'lk/rebase
-
i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C Hama
n
o
Merge branch 'jc/rev-li
s
t-simplify-me
r
ges-fi
r
st-parent'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge
bra
n
ch 'hv/submodule-update-n
u
k
e-sub
m
o
d
ules
'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hama
n
o
Merge
b
r
anc
h
'
nd/ex
c
lude-
w
o
r
k
around-top-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Ha
m
ano
Merge branch 'nd
/
stream-
p
ack-
o
bjects'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Mer
g
e b
r
a
n
c
h
'
nd/st
r
e
a
m
-
i
ndex-pac
k
'
commit
|
commitdiff
|
tree
2012-06-28
J
u
ni
o
C
Hamano
Merge branch 'mm/ver
i
fy-filename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
amano
Merge branch 'jk/diff
-
no-index-pager'
commit
|
commitdiff
|
tree
2012-06-26
Junio
C Hamano
in
d
e
x-pack: Disable th
r
eadi
n
g on c
y
gwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Second batch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
J
unio C H
a
ma
n
o
Merge branch 'lp/n
o
-cmd-http-
f
etch'
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Merg
e
bra
n
ch 'cn
/
cherry-pick-
r
ange-docs'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Haman
o
Merge branch 'lm/
g
it
-
blame-el'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io
C H
a
m
ano
Merge br
a
nc
h
'rs/ipv6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Mer
g
e bran
c
h 'jc/ustar-checksum-is-unsigned'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hama
n
o
Merge b
r
anch 'rs/git-bla
m
e-mapcar-map
c
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'rr/d
o
c
-
c
ommit'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge
b
ranch 'nd/i1
8
n-mis
c
'
commit
|
commitdiff
|
tree
2012-06-25
J
un
i
o C Hama
n
o
Merge
b
r
anc
h
'n
d
/i18n-
b
ranch-le
g
o
'
commit
|
commitdiff
|
tree
next