repo.or.cz
/
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 'jk/format-patch-am'
2011-05-15
Junio
C
Hamano
g
i
t_op
e
n
_
noat
i
me(
)
: drop
u
nus
e
d p
a
r
a
m
eter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
sha1_f
i
le: ty
p
ofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
read_sha1
_
fil
e
(): allow se
l
ective bypassing of
replace
m
ent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
inline lookup_replace_ob
j
ect() calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Haman
o
read_sha1_file(): get rid o
f
read_sh
a
1_
f
ile_
r
e
p
l()
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jun
i
o
C
Hamano
t
6
050: make su
r
e we test not just commit replacement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C
H
amano
Dec
l
are lookup_
r
eplace_obje
c
t
(
)
in cache
.
h, n
o
t
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Juni
o
C Haman
o
M
e
rge b
r
a
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfjörð Bjarmason
Makefile: add xgettext ta
r
get f
o
r *
.
sh files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnf
j
örð Bjar
m
ason
g
i
t-sh-i18n
.
s
h
:
add
G
I
T
_
G
ETTEXT_POISON s
u
ppor
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Æva
r
Arnfjö
r
ð
Bjarmason
git
-
sh-i18n
.
sh: add no-op gettext() an
d
eval
_
g
e
tte
x
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Ævar Arnfjörð
B
j
armason
gi
t
-sh-i18n--en
v
subs
t
:
o
ur own envs
u
bst(
1
) for
e
v
al_ge
t
te
x
t()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Ni
e
der
a
dd, m
e
r
ge, diff: do not
u
s
e str
c
asecmp to co
m
pare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Jens Lehmann
Submodules: Don't parse
.
gitm
o
dules when
it contains
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-14
Heiko
V
oigt
test
t
hat git status works with merge
c
onflic
t
in,
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Bigfile
:
teach
"git add" to send
a
large file st
r
aight
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Luke D
i
a
mand
git-p4: warn if git a
u
thor
s
hip won't be ret
a
in
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Update draft release notes to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Merge
b
ranch
'
bf/co
m
m
i
t-t
e
mplate-no-cl
e
a
nup'
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
ano
Merge branch 'jc/t1506-s
h
ell-param-expansion-gotcha
'
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
Merge branch
'rr/r
e
re
r
e-libif
y
-c
l
ear
-
gc'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Me
r
ge branch 'js/maint-
s
end-pack-stateless-rpc-deadlo
c
k
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Ha
m
ano
M
erge branch
'
j
h
/dirstat-lines'
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Mer
g
e
branch 'jc/fix-add-u-unm
e
rged
'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e
branch 'jn
/
s
etup-revi
s
ions-gl
o
b-
a
nd-fr
i
ends-passthru'
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
Me
r
g
e b
r
anch 'cn/log-pars
e
-
opt'
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merg
e
branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o
C
H
amano
Pr
e
pare
for
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C
H
amano
Merge b
r
an
c
h
'aw/m
a
int-reba
s
e-i
-
p-no-ff' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Me
r
ge branch 'js/
b
lame-pa
r
sename'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge branch
'
gr/cvsimport-a
l
te
r
native-cvspass-lo
c
at
i
on
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge
branch 'cj/p4merge' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
erge branch 'jk/merge
-
one-file-
w
orking-tree' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
H
amano
M
e
r
ge branch 'j
c
/fi
x
-dif
f
-
f
iles-unme
r
ged'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
m
ano
Merge branch 'mz
/
maint
-
r
e
n
a
me-unmerged' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Johan Herlan
d
t5400: Fix a couple of
t
ypos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Haman
o
M
erg
e
b
ranch 'nd/struct-pat
h
spec'
commit
|
commitdiff
|
tree
2011-05-13
Johannes S
i
xt
Twe
a
k t3
1
0
2
-l
s
-tree-wild
c
ards t
o
run on
Wi
n
dows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
J
ohannes Sixt
t3703: Sk
i
p
tests using d
i
recto
r
y name ":
"
o
n Windows
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Merge branch 'jc/main
t
-1
.
7
.
4-path
s
pec-stdin-
a
nd-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Ju
n
io C Hamano
Merge branch 'j
c
/m
a
int-
1
.
6
.
6-p
a
thspec-stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Hamano
r
evision
.
c: leave a note for "a l
o
ne :" e
n
ha
n
cement
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
J
unio
C
H
am
a
no
Merge bran
c
h 'jc/ma
i
nt-1
.
6
.
6-p
a
ths
p
ec-stdin-and
-
cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
M
e
rge branch 'jc
/
maint-1
.
6
.
6-pat
h
s
p
e
c-s
t
d
i
n-
a
nd-cmdline
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
s
e
tup_revision
s
()
:
take pathspe
c
from comm
a
nd li
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Juni
o
C Hamano
Update draft
rele
a
se notes
to 1
.
7
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bran
c
h
'jn/g
i
twe
b
-d
e
p
endency'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
Hamano
Merge br
a
n
ch
'
jc/ma
i
n
t
-branch-mergeoptions'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
amano
Merge branch 'jn/main
t
-test-merge-ver
i
fy-p
a
r
e
n
t
s'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge bra
n
ch
'
v
h
/config
-
i
n
t
e
racti
v
e-singlekey-doc'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Ham
a
no
Merge branch 'jc/maint-
a
dd
-
p-
o
ve
r
lapping-hunk
s
'
commit
|
commitdiff
|
tree
2011-05-11
Junio
C Ha
m
a
n
o
Merge branch 's
r
/main
t
-
fast-i
m
port-tig
h
t
e
n-option-parsing'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Mer
g
e branch
'
dm/h
t
tp-cleanu
p
'
commit
|
commitdiff
|
tree
2011-05-11
Junio C Hamano
Merge
b
r
a
nch
'
jn/ct
a
gs'
commit
|
commitdiff
|
tree
2011-05-11
B
o
r
is
F
aure
Do not str
i
p
emp
t
y lines / trailing sp
a
ces from a commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
M
erge b
r
a
nch
'fc/compl
e
tion-zsh' into sg/completi
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Juni
o
C Hamano
Revert "completion: don't de
c
la
r
e '
l
ocal words' to
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Fel
i
pe Contreras
git-completion: fi
x
re
g
ressi
o
n in
z
sh suppo
r
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Con
r
ad Irwin
Test atomic git-co
m
mi
t
--interactive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Nguyễn T
h
ái N
g
ọc Duy
t3703, t4208
:
add test cases for
ma
g
ic pathsp
e
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hama
n
o
rev/pat
h
disambiguati
o
n: further restrict
"
m
isspelled
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Ha
m
ano
f
ix overslow :
/
no-su
c
h-string-ev
e
r-
e
x
i
sted diagno
s
tics
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio
C Hamano
fix o
v
erstrict :<path>
diagnosis
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
grep:
u
se get_pathsp
e
c
(
) correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
J
u
nio C Ham
a
no
paths
p
ec
:
dr
o
p "lone
:
means
no pa
t
hsp
e
c" from get_pathspec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Junio C Hamano
Rev
e
rt "magi
c
path
s
pec: add ":(ica
s
e)path
"
t
o matc
h
.
.
.
commit
|
commitdiff
|
tree
2011-05-10
Nguyễn
T
hái Ngọc Duy
spa
r
se checko
u
t
: do
n
ot
eagerly decide
t
he fate
f
or
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Nguy
ễ
n Thái Ngọc D
u
y
t1011: fix spars
e
-checkout initialization and
a
dd
n
ew
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Michael
S
c
h
u
bert
t
a
g: dis
a
l
l
ow
'
-'
as ta
g
name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Jun
i
o C Hamano
gi
t
-grep: do no
t
die upon -F
/
-
P when
g
r
ep
.
extend
e
d
Regexp
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conr
a
d I
r
win
Add
c
omm
i
t to list of config
.
singlekey
c
omm
a
nds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Conrad Irw
i
n
Add support for -p/--patch to git-c
o
mmi
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Co
n
rad
Irw
i
n
All
o
w gi
t
c
ommit --interactive
w
i
th p
a
ths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-10
Jeff
K
i
ng
t
7
501
.
8: fee
d
a meaningf
u
l command
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Mich
a
ł
K
i
edrowicz
git-grep: Bail out when -
P
i
s
use
d
w
i
th
-
F or -E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Michał Kiedrowicz
g
r
ep:
Add basic
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Michał Kiedrowicz
confi
g
ure
:
Check for libp
c
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Michał Kiedrow
i
cz
git-gr
e
p: Learn PCRE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Michał Ki
e
drowicz
grep:
Extract com
p
il
e
_re
g
e
x
p_f
a
i
l
ed()
f
rom c
o
mpi
l
e_regexp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Mich
a
ł Kiedrowicz
grep: Fix a typo
i
n
a
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Luke Diamand
g
i
t-p4
:
small improvements
to user-preserv
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jeff King
b
l
ame: add --line-p
o
rce
l
ain output format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jeff Ki
n
g
bl
a
m
e
: refa
c
tor porcel
a
in o
u
tput
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Jef
f
Ki
n
g
add tests for various
blame formats
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Johanne
s
Sixt
Honor
$(prefix)
set in con
f
ig
.
m
a
k
* when defi
n
i
n
g ET
C
_GIT*
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Revert "Hon
o
r
$(pref
i
x) set i
n
c
on
f
ig
.
m
ak* when defi
n
ing
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ham
a
no
conv
e
rt: make
it
h
a
r
d
er to scr
e
w up adding
a
conversion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Juni
o
C
H
a
mano
convert:
make it
s
afer to add con
v
e
rsion att
r
i
b
u
t
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
convert: give s
a
n
e
r
name
s
to crl
f
/eol v
a
r
i
ables, types
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
ano
co
n
v
e
rt: rename the "eol" global
variable to "core_
e
ol"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Ha
m
ano
index
_
fd
(
): sp
l
it int
o
two h
e
l
pe
r
functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio
C Hamano
index_fd()
:
tu
r
n
write_object and for
m
at_check
a
rgum
e
n
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
Junio C H
a
mano
t
1
5
0
7
: avoid "${parameter<op>'
w
ord'
}
" ins
i
de double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
o
nathan Nieder
c
ompletion: move pri
v
a
t
e shopt sh
i
m for zsh to __
g
it_
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Hamano
t3701: add-p
-
fix ma
k
es the last test
t
o p
a
ss
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
J
unio C Ham
a
n
o
rerere: lib
i
fy rerere_clear() an
d
rerere_gc()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Conra
d
Irwin
Use a temp
o
rary index for git
c
o
mmi
t
--i
n
t
eractive
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub Narebski
Remove
gitweb/gi
t
web
.
cgi an
d
other
legacy targets from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub
N
a
r
ebski
git-in
s
t
a
web: Simplify
build
d
ependency on gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
onat
h
an Nieder
tests: check
g
it d
o
es not ba
r
f on
merge
.
ff values for
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next