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
build: "make clean" should not remove configure-generated files
2012-07-19
St
e
fano Lattarini
b
u
ild: "make clean" should not remove configure-generated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
Stefano Lattarini
autocon
f
:
u
se AC_CONFIG_COMMANDS instead of ad-hoc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
S
tefano Lattar
i
ni
autocon
f
: r
e
m
o
v
e
few redundant semi
c
olons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
St
e
fano L
a
t
t
arini
autoconf
:
remove som
e
redundant shell indi
r
ections
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
Stefan
o
L
attari
n
i
autoco
n
f
: GI
T
_CONF_APPEND_
L
IN
E
-> GIT_CONF_
S
UBST
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-19
Ste
f
ano Lattarin
i
autoconf: GIT_CON
F
_APP
E
ND_L
I
NE: change signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio
C Hamano
Upda
t
e draft release notes fo
r
7th batch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hama
n
o
Mer
g
e branch 'tg/maint-cache-
n
ame-com
p
are'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
Hamano
Me
r
ge b
r
anch
'
j
k/index-pack-streaming-fix'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C H
a
mano
Merge
b
ranch 'jk/
m
aint-commit-amend-only-no-paths'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
i
o
C Hamano
Merge branch 'cw/amend
-
c
o
mmit
-
w
i
thout-me
s
sage'
commit
|
commitdiff
|
tree
2012-07-16
Jun
i
o C Hamano
Merg
e
branc
h
'
j
n
/
makefi
l
e-cleanup'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C Hamano
Merge branch 'ar/clone-honor-um
a
sk-at-t
o
p'
commit
|
commitdiff
|
tree
2012-07-16
Ju
n
io C
Hamano
Merge branc
h
'
jc/apply-3way'
commit
|
commitdiff
|
tree
2012-07-16
Junio C Ham
a
no
Merge branch 'cw/rebase-i
-
root'
commit
|
commitdiff
|
tree
2012-07-16
Junio C
H
amano
Mer
g
e
b
r
an
c
h 'pw/git-p4-move'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
M
e
rge branch 'pw/gi
t
-p4-jobs'
commit
|
commitdiff
|
tree
2012-07-14
Junio C Hamano
Merge bra
n
c
h
'jk/push-delete-ref-error-me
s
s
age
'
commit
|
commitdiff
|
tree
2012-07-13
J
u
n
i
o
C Hamano
Sixth bat
c
h f
o
r 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-stdin'
commit
|
commitdiff
|
tree
2012-07-13
J
u
nio C Hamano
Mer
g
e branch 'tg/ce
-
namelen'
commit
|
commitdiff
|
tree
2012-07-13
Ju
n
i
o
C Haman
o
Merge bra
n
ch
'
tb/s
a
nitize-decompos
e
d-utf-8-pa
t
h
na
m
e'
commit
|
commitdiff
|
tree
2012-07-13
Junio C Hama
n
o
Merg
e
b
r
a
n
c
h 'mm/m
e
d
ia
w
iki-tests'
commit
|
commitdiff
|
tree
2012-07-13
Juni
o
C
H
a
m
ano
Me
r
ge branch 'jn/vcs-svn
'
commit
|
commitdiff
|
tree
2012-07-13
Jun
i
o C Hamano
Merge branch 'mm/mediawiki-f
i
le-attachments'
commit
|
commitdiff
|
tree
2012-07-13
Junio
C
Hamano
M
e
rge
b
ranch 'tr/maint-show-walk'
commit
|
commitdiff
|
tree
2012-07-13
Junio C
Hamano
Merge
branch 'm
z
/re
b
ase-n
o
-
m
box'
commit
|
commitdiff
|
tree
2012-07-12
Gary Gibbons
git p4
:
add supp
o
r
t
for 'p4 move' in P4S
u
bmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Red
u
ce dra
f
t
rele
a
se note
s
to 1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
S
ync with 1
.
7
.
11
.
2
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
H
ama
n
o
Git
1
.
7
.
11
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-11
Jun
i
o C Hama
n
o
Merge
b
r
a
n
c
h
'jc
/
maint-blame-unique-abbrev' i
n
to
ma
i
n
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Hamano
Me
r
ge
branch 'rj/pla
t
form-pread-may-be-thr
e
a
d
-
unsafe
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
J
u
nio C Hamano
Mer
g
e branch 't
h
/diff-no-
i
n
d
ex-fixes' i
n
to maint
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Haman
o
Merge branch 'nd/clone-si
n
gl
e
-fix
'
i
nto maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C H
a
man
o
Merge branch 'jc/
r
e
v
-li
s
t
-
simplify-merges
-
first-par
e
nt
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Junio C
Hamano
Merge branch 'hv/submodul
e
-update-nuke-s
u
b
mo
d
u
les'
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C Hamano
Merge b
r
anch
'
j
k
/
diff-no-inde
x
-pager' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2012-07-11
Junio
C
Ham
a
no
Merge branch 'mm
/
verify-filena
m
e
-f
i
x' into maint
commit
|
commitdiff
|
tree
2012-07-11
Junio C Ham
a
no
Merge branch 'cn/cher
r
y
-
p
ick-
r
an
g
e-docs' into
maint
commit
|
commitdiff
|
tree
2012-07-11
Juni
o
C
Hamano
Merge b
r
anch 'jc/ustar-check
s
um-is
-
unsigned
'
into m
a
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Junio C Hamano
Merge branch
'jc/bu
n
dle-complete-notice' i
n
to main
t
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C Ha
m
ano
Merge
branch '
j
c/ls-files-i-dir' into maint
commit
|
commitdiff
|
tree
2012-07-11
J
uni
o
C
H
am
a
n
o
Me
r
g
e
b
r
anch 'jc/req
u
est-pull-ma
t
ch-
t
ag
n
ame' into ma
i
nt
commit
|
commitdiff
|
tree
2012-07-11
Ju
n
io C
H
amano
c
a
che_name_compa
r
e
(
): d
o
not tru
n
cate while
comparing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
J
e
ff King
in
d
ex-pa
c
k: loop whi
l
e
i
n
fla
t
ing objects in unpack_data
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff King
commit:
f
ix "--amend --o
n
ly
"
with no
p
at
h
spec
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Junio C Hamano
apply
:
t
e
sts
for the --
3
wa
y
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-10
Jeff Kin
g
add: create ADD_EDIT
.
pa
t
ch with mode 066
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C Hamano
rerere:
m
a
ke rr-cache fanout direct
o
ry honor um
a
sk
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io
C Hamano
apply: document --3wa
y
o
ption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio
C H
a
mano
a
p
ply
:
allow rerere()
to wor
k
on --3w
a
y r
e
sults
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Hamano
a
p
ply: register conflicted stag
e
s
t
o the
index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
appl
y
:
--3way
with add/a
d
d conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Ju
n
io C Hamano
apply: move
verif
y
_index
_
m
atch()
higher
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: plug the three-way merge logic i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: fall back on three-
w
a
y
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
H
amano
apply: accept -
3
/--3way c
o
mman
d
line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
amano
apply: move
"already
e
xists" logic to che
c
k_to_create()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C
Ha
m
an
o
apply: move ch
e
ck
_
to_c
r
e
a
te_blob()
c
loser t
o
its
s
ole
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
u
nio C H
a
ma
n
o
apply: further
split load_preima
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: ref
a
ctor "p
r
e
v
ious
pat
c
h" logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
apply: split load_pre
i
m
a
ge() hel
p
er function
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jun
i
o C Hamano
apply: factor out
checkout_tar
g
et() help
e
r function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
a
p
p
l
y: re
f
actor read_file_
o
r_
g
itlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C
H
amano
apply: clear_image() clea
r
s things a bit more
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C
Hamano
ap
p
ly:
a
bit mor
e
co
m
ments
o
n PATH
_
T
O
_BE_DELETED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio C Ha
m
an
o
ap
p
ly: fix an incomplete c
o
mment in chec
k
_pat
c
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Alex Riesen
Resto
r
e
umasks infl
u
ence on
the p
e
rmissions of work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Chris Webb
Allow edit of empt
y
message
w
i
th comm
i
t --amend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
unio
C Hamano
Me
r
ge git://github
.
com/git-l
1
0
n/git-po
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
ma
n
o
Fifth
b
atch fo
r
1
.
7
.
12
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Me
r
ge
branch
'
cw/help-ov
e
r-ne
t
wo
r
k
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Ha
m
ano
Merge br
a
nch
'mz/
e
mpt
y
-reb
a
se-te
s
t'
commit
|
commitdiff
|
tree
2012-07-09
Junio C
H
a
mano
Merge branch 'pw/git-p4-t
e
sts'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
Merge branch 'js/fast-export-paths-wi
t
h-spaces'
commit
|
commitdiff
|
tree
2012-07-09
Junio
C
Hamano
Merge
b
ran
c
h
'cw/no-de
t
a
c
hing-a
n
-un
b
orn'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C
Ham
a
n
o
Merge
b
ranch 'vr
/
u
se-our-perl-
i
n-tests'
commit
|
commitdiff
|
tree
2012-07-09
Junio C H
a
mano
Mer
g
e branch 'mm/credential-plumbing'
commit
|
commitdiff
|
tree
2012-07-09
Juni
o
C Hamano
Merge bra
n
ch 'jc/
m
aint-blame-un
i
que-abbrev
'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hamano
M
erge branch 'jn/perl-mak
e
m
ake
r
-l
e
a
d
ing-paths'
commit
|
commitdiff
|
tree
2012-07-09
J
u
n
io
C
Ha
m
a
no
Mer
g
e branch
'rj/platform-
p
re
a
d-ma
y
-be-threa
d
-u
n
s
afe'
commit
|
commitdiff
|
tree
2012-07-09
Junio C Hama
n
o
Me
r
g
e
b
r
anch 'mm/config-xdg'
commit
|
commitdiff
|
tree
2012-07-09
Jon
a
than Nieder
Makefile: document ground
r
u
les
f
or targ
e
t-specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff K
i
ng
Mak
e
file: move GI
T
-VE
R
SION-FILE depen
d
en
c
i
es c
l
ose
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
eff K
i
ng
Makef
i
le: build i
n
staweb
s
imil
a
r to other
scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Makefil
e
: update scripts when bui
l
d-time parameters
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
f
f
King
M
akefile: do not re
p
lace @@G
I
T_VE
R
SI
O
N
@
@ in s
h
ell scri
p
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff Ki
n
g
Makefi
l
e: spl
i
t prefix flags fr
o
m GIT-
C
FLAGS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan Nieder
Makefi
l
e: be silent
when only GIT_USER_A
G
ENT changes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
e
ff
King
Makefile: split GIT_US
E
R_AG
E
N
T from GIT-CFLAG
S
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
J
eff King
M
ake
f
ile:
d
o
not replace @@
G
IT_USE
R
_AGENT@@
in scri
p
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
Mak
e
file: apply dependencies consistentl
y
to sparse
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jeff King
M
a
kefile: do n
o
t h
a
ve git
.
o depend on c
o
mmon-cmds
.
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Jonathan N
i
ede
r
Makefile: fold XDIFF_H
and VCSSVN_H i
n
t
o LIB
_
H
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Torsten
B
ögershausen
git o
n
Mac OS and
p
r
ecomposed
u
n
icode
Helped-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Thomas
G
umm
e
rer
Repl
a
c
e strlen(
)
with ce_
n
a
m
elen()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-09
Matthieu Moy
git-remote-m
e
diawik
i
: u
p
d
ate comments to
reflect crede
n
ti
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-me
d
iawiki: be mo
r
e
d
efensi
v
e when requests
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2012-07-06
Matthieu Moy
git-remote-
m
edia
w
i
ki: mo
r
e effic
i
ent 'pul
l
' in the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next