repo.or.cz
/
git
/
jnareb-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/apply-3way'
2012-07-16
Junio C Haman
o
Merge bran
c
h 'jc/app
l
y
-
3
way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge branch 'cw/
r
ebase-i-r
o
ot'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o
C
Hamano
Merge bran
c
h
'pw/git-p4-m
o
ve'
commit
|
commitdiff
|
tree
2012-07-14
J
u
n
i
o C Hamano
M
erge
b
ra
n
c
h
'
p
w/git-p4
-
jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio
C
Hamano
Merge br
a
nch
'
jk/p
u
sh-de
l
ete-ref-error-m
e
ssage'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C Hamano
Sixth
b
atch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge b
r
anch 'jc/r
e
factor-diff-
s
tdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
H
amano
M
e
r
ge b
r
anch 'tg/ce-namelen'
commit
|
commitdiff
|
tree
2012-07-13
J
u
ni
o
C
Hamano
M
e
r
ge branc
h
'tb/sanitize-decomposed-utf-8-p
a
thn
a
me
'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Haman
o
Merge bra
n
c
h
'mm/med
i
a
wiki-te
s
ts'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
M
e
rge branch 'jn/vcs-svn'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
Hamano
Merge branch
'mm/mediawiki-file-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio C H
a
mano
M
e
rge br
a
nch 'tr/maint-show-
w
alk'
commit
|
commitdiff
|
tree
2012-07-13
J
uni
o
C Hama
n
o
M
e
rge branch 'mz/rebase
-
no-mbo
x
'
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio
C Hama
n
o
Reduce draft release notes to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Sync wi
t
h
1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hamano
Gi
t
1
.
7
.
1
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C
H
a
mano
Merge b
r
a
nch 'j
c
/maint
-
blame-unique-abbrev' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge bra
n
c
h
'rj/platform-pr
e
ad-may-be-thread-u
n
s
a
fe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
ma
n
o
Mer
g
e branc
h
'th/diff-no-in
d
ex-fixes'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'nd/clo
n
e-singl
e
-fix' into
m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch '
j
c/rev-list-si
m
plify-me
r
g
e
s-f
i
rst-parent
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
un
i
o C
Hamano
Merge b
r
anch '
h
v/submodule-up
d
ate-nuke-submodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hama
n
o
Merge br
a
nch 'jk/d
i
f
f
-no-index-pa
g
er' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'mm
/
ver
i
fy-fil
e
name-
f
ix' into
m
aint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'cn/c
h
erry-pick-range-docs' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge branc
h
'jc/ustar-
c
hecksum-is-unsigne
d
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
aman
o
M
erge
b
ranch 'jc/bundle-complete-notice'
into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
M
e
r
ge branch
'
j
c/ls
-
files-
i
-
di
r
'
into maint
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Merge branch 'j
c
/request-p
u
ll-match-tag
n
ame' int
o
maint
commit
|
commitdiff
|
tree
2012-07-10
Jun
i
o C H
a
mano
apply: tests for the --3way
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o
C
Hamano
app
l
y:
doc
u
ment --3way op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
m
an
o
a
pply: allow rerere() to work
on --3way results
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
app
l
y: reg
i
ster conflicted st
a
ge
s
to
the index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: --3
w
ay with
a
dd/add confl
i
ct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
apply:
m
ove verify_index_match() h
i
gher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
H
amano
apply: plug the three-way
merge logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o C H
a
mano
apply: fall back on three-way merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: accept -3/--3way com
m
an
d
lin
e
opt
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io C Hamano
ap
p
ly: move "
a
lread
y
e
xists" logi
c
to
c
heck_to_create(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
un
i
o
C Hamano
a
pply: move check_to_cre
a
te_blob(
)
close
r
t
o
i
ts sol
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
apply
:
further split loa
d
_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
ap
p
l
y: refactor "previous patch
"
logi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
H
amano
apply:
split load_p
r
eimage() he
l
per
function out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
a
n
o
apply: fac
t
or
o
u
t
check
o
ut_target() helper funct
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
ap
p
l
y: refactor read_f
i
le_or_
g
itlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
i
o
C
H
amano
apply: clear_ima
g
e() clea
r
s thin
g
s a bit m
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
p
ply: a
bit mor
e
com
m
e
nts on PATH_TO_BE_DELET
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
a
p
ply: fix an incompl
e
te
co
m
ment in check_pa
t
ch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merg
e
git:
/
/
github
.
c
o
m/gi
t
-l10n/git-
p
o
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Ha
m
ano
Fi
f
th batch for
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
bra
n
ch
'
cw/h
e
lp-o
v
er-ne
t
work'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
e
rg
e
branc
h
'm
z
/empty-reb
a
se-
t
est
'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge branch 'pw/g
i
t-p4-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
Me
r
ge bra
n
ch 'js/fast-export-p
a
ths-wit
h
-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Mer
g
e branch 'cw
/
no-deta
c
hing-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge
bra
n
ch 'vr/use-our-perl-in-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'm
m
/crede
n
tial-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C
H
a
m
ano
Merge branch 'j
c
/maint-blame-
u
ni
q
ue-abbrev'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
M
e
rge branch
'jn/perl-makemaker-
l
eadi
n
g-
p
aths'
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
m
ano
Merge branch '
r
j/p
l
a
t
form-prea
d
-may-be-thread-unsaf
e
'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
i
o
C H
a
ma
n
o
Merge branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
F
o
urth batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
J
unio C Hamano
Me
r
ge
branc
h
'nd/clone-si
n
gle-fix'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge br
a
nch 'th/diff-no-index
-
fixes'
commit
|
commitdiff
|
tree
2012-07-05
Junio C Ha
m
ano
Merge branch 'hv
/
re
m
ote
-
e
nd
-
hung
-
up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C H
a
m
a
no
Sync with i18
n
-po up
d
ate
s
in m
a
int
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
J
u
ni
o
C
Hamano
Merge branch 'm
a
int
'
o
f
git://github
.
com/git-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Junio C Hamano
b
lame: compute abbreviation w
i
d
th that ensure
s
uniq
u
eness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
di
f
f-index
.
c
: "git diff" h
a
s
n
o
nee
d
to r
e
ad blob f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
m
a
no
diff-index
.
c: unify handli
n
g of command line paths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C
H
a
m
a
n
o
diff-inde
x
.
c: do
n
ot pretend paths are path
s
pecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hama
n
o
T
hi
r
d batch
for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Ham
a
no
Merge
br
a
nch 'fc
/
git
-
pr
o
mpt-
s
cript'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
Ha
m
ano
Merge branch 'j
s
/sub
m
odu
l
e-relati
v
e'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C H
a
mano
Merge
branc
h
'
l
k/more-he
l
pful-status-
h
int
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
branch 'lk
/
rebase-i-x'
commit
|
commitdiff
|
tree
2012-06-28
J
unio C
H
amano
Me
r
ge branch 'j
c
/
rev-list-
s
implify-merges-
f
i
rs
t
-
parent'
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Haman
o
Merge br
a
nch
'hv/submodul
e
-
u
pdat
e
-nuk
e
-submodules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hama
n
o
Merge
branch 'nd/exclude-workaround-
t
op-heavy'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C
Hamano
Me
r
g
e branch 'nd/stream-pac
k
-object
s
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge
b
ranch 'nd/st
r
eam-index-pack'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge branch 'mm
/
verify-f
i
l
ename-fix'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
M
e
r
ge branc
h
'
j
k/diff-no-index-pag
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Junio C Hama
n
o
inde
x
-pa
c
k: Dis
a
bl
e
t
hreadi
n
g on cygwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ham
a
no
Second batch f
o
r 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C
Hamano
Merge
branch 'lp/no-
c
md-http-fetch'
commit
|
commitdiff
|
tree
2012-06-25
J
u
n
io C Ha
m
ano
Merge branch 'cn/cherry-p
i
c
k-ra
n
ge-docs'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge b
r
a
nch 'lm
/
git-
b
lame-
e
l'
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
i
o
C Hamano
Merge b
r
anch 'rs/ipv6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge branch 'jc
/
ustar-checks
u
m
-is-u
n
signed'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o
C Hamano
Merge bra
n
ch 'rs/git
-
blame-
m
ap
c
a
r
-mapc'
commit
|
commitdiff
|
tree
2012-06-25
Junio C
Ham
a
no
Merge branc
h
'rr/doc-co
m
mit'
commit
|
commitdiff
|
tree
2012-06-25
Jun
i
o C Hamano
Merge branch '
n
d/i18n-misc
'
commit
|
commitdiff
|
tree
2012-06-25
J
u
nio C Hama
n
o
Merg
e
branch
'nd/i18n-branch-lego'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C Hamano
Merge branch 'jk/n
o
-more-as
c
iidoc
7
'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ham
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2012-06-25
Junio
C
Ham
a
no
t/RE
A
DME: add a bit more Don'ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Ha
m
ano
tests: enclose $PERL_P
A
TH i
n
double quotes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
t/test-lib
.
sh: export
P
ERL_PA
T
H for
use in scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next