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
autoconf: GIT_CONF_APPEND_LINE: change signature
2012-07-16
Jun
i
o
C
Ham
a
no
Update draft release n
o
tes
f
or 7
t
h batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C H
a
ma
n
o
Mer
g
e branch 'tg/maint-cache-nam
e
-compare'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge
b
ranch 'jk/index
-
pac
k
-streaming-
f
i
x'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hama
n
o
Me
r
g
e
branch 'jk/maint-commit-
a
mend
-
only-n
o
-pa
t
hs'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Merge bran
c
h 'cw/amend-commit-without-m
e
ssag
e
'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Hamano
Mer
g
e branch 'jn
/
makefile-clean
u
p'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Merge
branch 'ar
/
clone-honor-uma
s
k-at-top'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C Ha
m
an
o
Merge branch 'jc
/
ap
p
l
y-3way'
commit
|
commitdiff
|
tree
2012-07-16
Juni
o
C
Hamano
Merge b
r
anch
'cw/re
b
ase-i-r
o
ot'
commit
|
commitdiff
|
tree
2012-07-16
J
un
i
o C Hamano
Merg
e
b
r
anch 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
e
rge branc
h
'
pw/g
i
t-
p
4-
j
obs'
commit
|
commitdiff
|
tree
2012-07-14
J
u
nio C Hamano
M
erge bran
c
h '
j
k/push-delete-ref-error-
m
e
ssage'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Sixt
h
b
a
tch for 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Me
r
ge branch 'jc/refac
t
or-d
i
ff-stdin'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
Mer
g
e branch 'tg
/
ce-name
l
en'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
io C Hamano
Merge branch 'tb/saniti
z
e-dec
o
mpo
s
ed-utf-8-path
n
ame'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ham
a
n
o
Merge branch
'
mm/media
w
iki-tests'
commit
|
commitdiff
|
tree
2012-07-13
J
unio C
H
amano
Merge
b
ranc
h
'
j
n
/vcs-s
v
n'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Merge branch 'mm/med
i
aw
i
ki-file
-
att
a
c
hm
e
n
ts'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C Ha
m
ano
Mer
g
e
b
ranch 'tr/m
a
int-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hamano
Me
r
ge bran
c
h 'mz/
r
e
base-no-mbox'
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Redu
c
e draft release note
s
to 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
J
unio C Hamano
Sync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o
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
Me
r
ge branch
'jc/maint-blame-u
n
iqu
e
-abb
r
e
v
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Haman
o
Merge
b
r
a
nch
'rj/platfo
r
m
-pread-may-be-thr
e
ad-unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Merge branch 'th/diff-no-index-fi
x
es
'
into mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
Me
r
ge branch 'nd/cl
o
ne-sin
g
l
e
-
fix' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch 'j
c
/r
e
v-list
-
simp
l
ify-merges-first-par
e
nt
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
H
am
a
no
Merge
b
ranch 'hv/submodule
-
updat
e
-nuke-
s
ubmodules'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
i
o
C Haman
o
Merge branch 'jk/diff-no
-
index-pag
e
r' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge br
a
nch
'm
m
/ver
i
f
y
-file
n
ame-fix
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C Hamano
Merge branc
h
'cn
/
cherry-pick-ran
g
e-docs' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Merge branch 'jc/u
s
ta
r
-
checksum-is-unsigned
'
i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C
Hamano
Merge branch 'jc/bundle-co
m
p
l
ete-notice'
i
n
t
o
maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merg
e
br
a
nch 'jc/ls-files-
i
-dir' into m
a
int
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hama
n
o
Merge
b
r
anch 'jc/r
e
quest-pull-match-t
a
gname' into m
a
in
t
commit
|
commitdiff
|
tree
2012-07-11
Junio C
H
amano
cache_name_
c
om
p
a
re():
d
o not tr
u
ncate whil
e
comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
ap
p
ly
:
t
e
sts
f
or t
h
e --3way op
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
rerere:
m
a
k
e rr-cache f
a
nout directory
h
o
nor
umask
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
ano
apply:
d
ocument --3way option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
ply: allow rerere() t
o
work on --3way
r
esults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Haman
o
app
l
y: register conflic
t
ed
s
tages to the in
d
ex
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Haman
o
a
p
ply:
--3wa
y
with ad
d
/add conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
appl
y
:
move verif
y
_
i
n
dex_match() hi
g
her
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: plug the three-way m
e
r
g
e logic in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
ap
p
ly: 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 command line opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: move "a
l
ready exis
t
s" logic to
check_to_crea
t
e(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply:
m
ove chec
k
_to_create_blob()
closer
to
i
t
s
sole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: furt
h
e
r
split l
o
ad_preimage()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Ha
m
ano
apply:
re
f
actor
"
previou
s
patch"
l
ogic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
a
pply:
s
plit load_
p
reimage
(
) helpe
r
f
unc
t
ion out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
apply: factor ou
t
c
h
eck
o
ut_target(
)
helper function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
appl
y
: refac
t
o
r read_f
i
le_or
_
g
itlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
a
pply: cl
e
ar
_
ima
g
e() clears
t
hing
s
a bit mo
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply:
a bit mo
r
e comm
e
nts on PATH_TO_BE_DE
L
ETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
mano
apply:
f
i
x
an inc
o
m
plete comment in check
_
patch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
Merge git://gi
t
hub
.
com
/
git
-
l10n/g
i
t
-
po
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Ha
m
ano
Fifth ba
t
ch for 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branc
h
'c
w
/help-over-net
w
ork'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Haman
o
Merg
e
br
a
n
c
h 'mz/empty-rebas
e
-
t
est'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Ha
m
an
o
Merge bran
c
h 'pw/git-p4-test
s
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Merge branch 'j
s
/fast-
e
xport-paths-with-spa
c
es'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
Merge b
r
an
c
h
'
cw/no-
d
etaching-an-unborn'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C Hamano
M
e
rge bra
n
ch 'vr/use-
o
ur-per
l
-i
n
-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Mer
g
e
bra
n
ch 'mm
/
credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
ma
n
o
M
e
rge br
a
nch
'
jc/maint-blame-unique-abb
r
e
v'
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
ano
M
erge bra
n
c
h
'jn/
p
erl-ma
k
emaker-l
e
ad
i
ng-paths'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'rj
/
platfo
r
m-pread-may-be-thread-uns
a
fe'
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C
Hama
n
o
Mer
g
e
branch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-05
Juni
o
C
H
amano
Fourth b
a
tch
f
or 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-05
Junio C Hamano
Merge branch '
n
d/clone-si
n
gl
e
-fix'
commit
|
commitdiff
|
tree
2012-07-05
Jun
i
o C Hamano
Merge branch
'
th
/
diff-no-ind
e
x-fixes'
commit
|
commitdiff
|
tree
2012-07-05
J
u
nio
C
Hamano
M
e
rge
b
ra
n
ch 'hv/remote-end-hung-up'
commit
|
commitdiff
|
tree
2012-07-02
Junio C
Ham
a
no
Sync w
i
th i18n-po
u
pd
a
tes i
n
maint
# Via
Junio C Hamano
(1) and Peter Krefting (1)
commit
|
commitdiff
|
tree
2012-07-02
J
u
n
i
o
C
Ha
m
ano
Me
r
g
e
bra
n
ch 'mai
n
t'
of git:/
/
github
.
c
om/
g
it-l10n/git
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Juni
o
C Hamano
b
l
ame: compute
abbrevia
t
ion
w
idth that ensures
uniqueness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Juni
o
C Ham
a
n
o
d
iff-index
.
c: "git diff" has no need to re
a
d
b
lob from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
a
mano
di
f
f-
i
ndex
.
c
: unify handling
of comma
n
d line
path
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
ma
n
o
diff-i
n
dex
.
c: do not
p
retend p
a
ths are pathspecs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
T
h
ird batch f
o
r 1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o
C Hamano
Merge bran
c
h 'fc/git-prompt-scr
i
p
t'
commit
|
commitdiff
|
tree
2012-06-28
J
u
nio C Hamano
Merge branch 'js/submodule-relative'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C
H
ama
n
o
Mer
g
e
b
ranch '
l
k
/
m
ore-helpfu
l
-s
t
a
tus-h
i
n
ts
'
commit
|
commitdiff
|
tree
2012-06-28
Ju
n
i
o C
Hamano
Merge
b
ranc
h
'lk/rebas
e
-i-
x
'
commit
|
commitdiff
|
tree
2012-06-28
Jun
i
o C Hamano
M
erge branch 'jc/rev
-
list-simplify-merg
e
s-fir
s
t-pare
n
t'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Hamano
Merge br
a
nch 'hv/
s
ubmodule-upda
t
e-nuke-su
b
modules'
commit
|
commitdiff
|
tree
2012-06-28
Junio C H
a
mano
Merg
e
branch 'nd/exclude-workaround-top-heav
y
'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Me
r
ge
branc
h
'nd/stream-pack-object
s
'
commit
|
commitdiff
|
tree
2012-06-28
J
unio
C
Hamano
Merge branch
'n
d
/str
e
am-index-pa
c
k'
commit
|
commitdiff
|
tree
2012-06-28
Junio
C Ham
a
n
o
Merge
b
ranch 'mm/verify-f
i
lename-fix'
commit
|
commitdiff
|
tree
2012-06-28
Junio C Haman
o
Merge bra
n
ch 'jk/diff-n
o
-index-pag
e
r'
commit
|
commitdiff
|
tree
2012-06-26
Junio
C Hama
n
o
in
d
ex-pack: Dis
a
ble thre
a
din
g
on cygw
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Ju
n
io C Hamano
S
e
cond batch fo
r
1
.
7
.
1
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-06-25
Junio C H
a
mano
Merge branch 'lp/no-cmd
-
http
-
f
etch'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Ha
m
ano
Merg
e
branch 'cn/che
r
ry-pic
k
-
range
-
do
c
s'
commit
|
commitdiff
|
tree
2012-06-25
Junio C Hamano
Merge branch 'lm/git-
b
l
a
me-el'
commit
|
commitdiff
|
tree
2012-06-25
Juni
o
C
Hamano
Merge branch 'rs
/
ipv6-ssh-url'
commit
|
commitdiff
|
tree
2012-06-25
J
unio C Hamano
Merge branch
'
jc/ustar-check
s
um-is-u
n
signed'
commit
|
commitdiff
|
tree
next