repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fk/threaded-grep'
2010-01-19
Junio C H
a
ma
n
o
Mer
g
e branch 'js/
w
indow
s
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Merge branch 'jm/maint-1
.
6
.
5
-grep-NUL-terminate'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlinks
.
c: re
m
o
v
e u
n
used functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
object
.
c: r
e
m
o
ve
u
n
use
d
functio
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that merge strategies c
a
n now take thei
r
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hama
n
o
Make
"s
u
btree"
p
a
rt m
o
r
e
o
rthogo
n
al
to
the rest of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C Hamano
pull: Fix
p
arsing of
-
X<op
t
ion>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Update draft release
notes
to
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
M
e
rge branch
'
tc/
t
e
st-locate-httpd'
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Merge branc
h
'j
h
/
c
om
m
it-status'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
M
erge branch '
j
n/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
Ham
a
n
o
M
e
rge branch 'jc/m
a
int-1
.
6
.
1-checkout-m-custo
m
-merge'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
Hamano
Mer
g
e branch 'tc/
c
lon
e
-
v-
p
r
o
gress'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
a
no
Merge branch 'tc/smart-
h
t
tp-restr
i
c
t
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
M
er
g
e b
r
anch 'jk/run-comm
a
n
d
-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C
H
am
a
no
Mer
g
e branch 'sr/gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Update CO
P
Y
I
NG with GPLv2 with new FS
F
address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
use
r
_
i
dent
_
suf
f
i
ciently_given(): refactor the
l
ogic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
mano
user_id
e
nt_suffici
e
n
t
ly_given(): ref
a
ctor the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
rerer
e
:
h
onor conflict-
m
a
r
ker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
n
o
rere
r
e
:
p
r
e
pare for customizable confl
i
c
t
mark
e
r length
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
co
m
mi
t
.
c::
p
rin
t
_
s
u
mmary: do
no
t
release the format
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
co
n
flict-ma
r
ker-size: ne
w
attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
rerere: use ll_merge()
i
nstead of using x
d
l
_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree: use ll_merge()
not xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
x
dl_merge(): allow passing down
marker_size in xmp
a
ram_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xd
l
_merg
e
()
:
introduce xm
p
aram_t for merge spe
c
i
fic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
g
it
_
attr(): fix fu
n
c
tion signature
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Mer
g
e bra
n
ch '
m
a
int'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
a
no
Merg
e
branch
'
c
c
/r
e
set-more'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ha
m
ano
Teach diff that mo
d
ifie
d
submodul
e
di
r
ecto
r
y is dirty
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C
H
amano
grep
--no-i
n
dex: allow use of "git grep" o
u
tside
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Jun
i
o
C
H
a
mano
grep: prepa
r
e t
o
run outside of a work tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erge br
a
n
ch
'jc/ch
e
ckout-merge
-
bas
e
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
n
i
o C Hamano
Merge bran
c
h 'r
s
/ma
i
n
t-archive-match-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge b
r
a
n
ch 'i
l
/
v
cs-
h
el
p
er'
commit
|
commitdiff
|
tree
2010-01-13
J
unio
C H
a
m
a
no
strbuf_addbuf(): a
l
low passing
t
he same bu
f
to dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
J
un
i
o C Hamano
Merge
b
ranch 'cc/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge bra
n
c
h
'
nd/spar
s
e'
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C Ham
a
no
t7502: test commit
.
s
t
atus, --status a
n
d --n
o
-stat
u
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out pessimization to use fixma
t
ch()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
grep: rip out support for ex
t
e
rnal g
r
ep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
M
erge branch
'maint
'
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
Hamano
strbuf
.
c
:
r
e
mov
e
unused func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
sha1_f
i
le
.
c: remove unused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
mailmap
.
c
:
remove
u
nused function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C
H
amano
utf8
.
c:
ma
r
k fi
l
e-local fu
n
ction s
t
at
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
un
i
o C Hamano
s
ubmodu
l
e
.
c: mark file-l
o
cal fun
c
t
i
on static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
q
uote
.
c:
mark file-local fu
n
ction stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
remote-curl
.
c: mark
file-lo
c
al fu
n
cti
o
n
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
rea
d
-cache
.
c: ma
r
k
fil
e
-
local function
s
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Ha
m
ano
pars
e
-options
.
c
:
mark
fil
e
-lo
c
al func
t
ion stati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
e
n
t
r
y
.
c: mark file-local
fu
n
ction
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C H
a
ma
n
o
http
.
c: ma
r
k fil
e
-local functions
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Ham
a
no
Merg
e
bra
n
c
h
'jc/maint-1
.
6
.
4-grep-look
a
head' into jc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
am
a
no
g
r
ep: optimi
z
e built-in grep by
skipping l
i
n
es
t
h
at
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
grep:
-
L should s
h
ow empt
y
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Haman
o
pretty
.
c: ma
r
k
f
ile-
l
ocal
f
unction
s
tati
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
builtin
-
rev
-
l
ist
.
c: mark file-local function
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C Hamano
bi
s
ect
.
c
:
mark fi
l
e
-l
o
cal function
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Jun
i
o C Ha
m
ano
rerer
e
forget
path: forget
recorded resolut
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Jun
i
o C Hamano
rerere:
refactor
r
erere logic to make it
i
ndepend
e
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
amano
ident
.
c: treat $EMAIL as giving u
s
er
.
e
m
ail
i
denti
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
ident
.
c: c
h
ec
k
e
x
p
l
i
cit identity for na
m
e
a
nd email
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
n
ch 't
r
/ht
t
p-upd
a
tes'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
M
e
rge branch 'jk/maint-1
.
6
.
5-reset-hard'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Hamano
M
e
rge branch 'jk/push-to-del
e
t
e
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merg
e
b
r
anch 'mm/config-
p
ath'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge bra
n
ch 'pm/c
v
s-en
v
i
ron'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
nch 'tr/m
a
int-1
.
6
.
5
-
b
ash-prompt-show-submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Hamano
M
e
rge b
r
anc
h
'bg/main
t
-
remote-update-default'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
am
a
n
o
Merge bran
c
h '
m
m
/
diag-path-in-t
r
eeish'
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
io C Hamano
M
e
rge branch 'fc
/
opt-
q
u
i
e
t
-
g
c-reset'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merge branch
'
maint-1
.
6
.
2' int
o
maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
Merg
e
branch 'maint-1
.
6
.
1' into maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
Merge
b
r
a
nch
'maint-1
.
6
.
0
'
into
ma
i
nt-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Haman
o
ls-
f
iles: fix overeag
e
r
p
a
thspec optimization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Haman
o
read_directory(): fu
r
the
r
split treat
_
pa
t
h()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Ju
n
io C Hama
n
o
read_dire
c
tory
_
re
c
u
r
sive(): refactor handling
o
f
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
J
un
i
o C Hamano
t3
0
01: test l
s
-f
i
l
e
s -
o
ignored/dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-08
Junio C Hama
n
o
id
e
n
t
.
c: remove unused variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hamano
D
esc
r
ibe second ba
t
ch for 1
.
7
.
0
in draft rel
e
ase not
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ha
m
ano
Merge branch 'js/filter-b
r
anch-prime
'
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io C Hama
n
o
M
er
g
e
branch 'sb/maint-octopus'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Ham
a
no
Merge
b
ranch
'mg/
t
ag-d-show'
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o C Hamano
Me
r
g
e
branch
'
s
o/cvsserver
-
u
pdate
'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge
branch 'bg/maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io
C Haman
o
Merge branch 'mv/commit-date'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C
Hamano
Me
r
ge
b
ranch 'mo/bin-
w
rappers'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
read-tree -
-
debug-
u
npack
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C H
a
m
ano
unpack-tr
e
es
.
c:
l
o
ok ahe
a
d in the index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
unpack-trees
.
c: prepare
f
or lo
o
king ahead
in the
i
n
d
ex
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
J
u
ni
o
C Ham
a
no
checkout
-
m: do not try to fa
l
l
b
ack to --
m
erge from
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
check
o
ut -m
path: fix recre
a
ting conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
J
unio
C Haman
o
.
gitattributes: detect
8
-space
i
ndent i
n
she
l
l s
c
rip
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hama
n
o
F
i
x
bit assignment for CE_CONFL
I
CTED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C
Hama
n
o
Aggressive three-way merge: fi
x
D/F case
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Ju
n
io C Ha
m
ano
tra
v
erse_t
r
ees(): handle D/F conf
l
ict case sanely
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio
C
Ham
a
no
more D/F conflict tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next