repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
rebase -i: Export GIT_AUTHOR_* variables explicitly
2010-01-17
J
unio C Ha
m
a
no
conf
l
ic
t
-ma
r
k
e
r-si
z
e: new attrib
u
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
rerere: use
l
l_merg
e
(
)
instead
o
f using xdl_me
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-t
r
ee: use ll_merge() not
x
d
l
_
merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
un
i
o C Haman
o
xdl_merge(): allow p
a
ssing d
o
w
n
m
arker_size i
n
xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
xdl_merg
e
(
): introduce xmparam_t for merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Haman
o
git_attr(): fix fun
c
ti
o
n signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
a
mano
M
erge
branch
'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
Ham
a
no
Teach
diff
that
modified submodule directory is
dirt
y
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 Hamano
g
r
ep --no-index:
a
llow
u
se of "git
g
r
e
p
" out
s
ide a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C
Hamano
gr
e
p: prepare to run
outside of a work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hama
n
o
Merge branch '
j
c/c
h
eckout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hama
n
o
Mer
g
e branch
'rs/maint-archiv
e
-match-pat
h
s
p
ec'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C Haman
o
M
e
rge b
r
a
nch
'il/v
c
s
-
he
l
per'
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C
Ha
m
ano
strbuf_addbuf(): allow passing the same buf to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
Merge bran
c
h
'
c
c
/reset-more'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Ha
m
ano
Merge branch '
n
d/sparse'
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Hamano
t7502: test commit
.
statu
s
,
--s
t
a
tus and
-
-no-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
unio C Haman
o
grep: rip out pessimization to
u
se fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hama
n
o
grep
:
r
i
p out
supp
o
rt for e
x
terna
l
grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
strbuf
.
c: remove
u
n
u
s
ed function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
nio C Hamano
sha1_file
.
c: remove unuse
d
func
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
m
a
ilmap
.
c: remove
un
u
sed
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
ut
f
8
.
c: mark file-local fun
c
ti
o
n static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
amano
sub
m
o
d
ule
.
c: mark file
-
l
oca
l
function 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 function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
remote-c
u
rl
.
c: mark file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
read-cach
e
.
c: mark
f
i
le-loc
a
l
f
unction
s
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
a
m
ano
parse-options
.
c: mar
k
fil
e
-local
f
unction
sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
amano
entry
.
c:
m
ark fil
e
-
l
o
c
a
l
functio
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
h
t
tp
.
c: mark file-local func
t
ions
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C Hamano
Merge branch 'jc/maint-1
.
6
.
4-gr
e
p-lookah
e
ad' into jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
io C Hamano
grep: optimize bui
l
t-in grep by skip
p
ing
lines that
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
io C Hamano
grep: -L sh
o
uld show
empty
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
pretty
.
c:
mark fil
e
-local funct
i
o
n
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
bu
i
ltin-rev
-
list
.
c:
mark file-local functio
n
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
amano
bise
c
t
.
c: mark fi
l
e-local functi
o
n
s
tati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Hamano
rerere f
o
rget path: fo
r
get recor
d
ed re
s
ol
u
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C
H
a
m
ano
r
e
rere:
refactor rerere logi
c
to make
it indep
e
ndent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C
H
ama
n
o
ident
.
c
:
t
r
e
at $EMAIL as
g
iving use
r
.
e
m
ail id
e
ntity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
ident
.
c:
check explicit identity for
n
ame an
d
e
m
ail
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
u
n
io C
H
amano
Merge branch 'tr/
h
t
t
p
-
upda
t
es
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C
H
am
a
no
Merge
b
ranch 'jk
/
mai
n
t-1
.
6
.
5-re
s
et
-
hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Ha
m
ano
Merge branch 'jk/
p
ush-to-
d
elete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
n
o
M
erge branch 'mm/config-path'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Ham
a
no
M
e
rge br
a
nch
'
pm/cvs-environ'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C
Hamano
M
erge branch 'tr/m
a
in
t
-
1
.
6
.
5-bash
-
pro
m
p
t
-
s
h
o
w
-
submodule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Me
r
ge br
a
nch 'bg/maint-remote
-
update-de
f
ault'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
nch '
m
m/diag-path-in-tr
e
eish'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'fc/opt-quiet-gc-reset'
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Ham
a
no
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C Hamano
Me
r
ge branch 'maint-1
.
6
.
2'
into maint
commit
|
commitdiff
|
tree
2010-01-10
Jun
i
o C
Hamano
Merge b
r
anch 'maint-1
.
6
.
1' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Hamano
Merg
e
b
r
anch '
m
aint-1
.
6
.
0' into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
Juni
o
C
Hamano
ls
-
fi
l
es: fix overeager pa
t
h
s
pec optimizati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Ham
a
no
read_directo
r
y(): further split treat_pa
t
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
read_
d
irectory_recursive(
)
: refacto
r
handling of a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio
C
Hamano
t
3001: te
s
t ls-fi
l
es -o ignore
d
/dir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-08
Junio C H
a
mano
id
e
n
t
.
c:
remove unused variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C
H
aman
o
Des
c
ribe
s
econd
b
atch f
o
r 1
.
7
.
0 in draft rel
e
ase notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge bra
n
ch
'
js/filter-branch-prime'
commit
|
commitdiff
|
tree
2010-01-07
J
un
i
o C Hamano
Merge branch 's
b
/maint-octopus'
commit
|
commitdiff
|
tree
2010-01-07
J
u
n
i
o C H
a
ma
n
o
Me
r
ge b
r
a
nch 'mg/tag-d-s
h
o
w'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
M
erge branch 'so/cvsser
v
er-updat
e
'
commit
|
commitdiff
|
tree
2010-01-07
J
u
nio C Haman
o
Me
r
ge branch 'bg/maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Ha
m
a
no
M
erge bra
n
ch 'mv/commit-d
a
te'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Haman
o
Merge bran
c
h 'mo/
b
in-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io C
Ham
a
no
chec
k
out -m:
do not
t
r
y
t
o
f
al
l
b
a
ck to -
-
merge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio
C
Ha
m
ano
checko
u
t -
m
path: fix recreating conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio
C
Ham
a
no
.
gitattr
i
butes:
d
etect 8-spac
e
inde
n
t
in s
h
ell scripts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C
Ham
a
no
F
ix
b
it assi
g
nment
f
or CE_CONFLICTED
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Junio C H
a
mano
"reset --merge": f
i
x unmer
g
e
d case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
J
u
nio C Hamano
Merge
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2009-12-31
J
u
ni
o
C
Hamano
Merge
branch 'ma
i
nt-1
.
6
.
0
'
into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C H
a
ma
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-12-30
J
u
n
i
o C
H
am
a
no
b
r
anch -d: b
a
se the "already-merged" safet
y
on the
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-30
Ju
n
io
C Hamano
M
erge
b
ra
n
ch 'm
a
int-1
.
6
.
1' i
n
t
o maint
commit
|
commitdiff
|
tree
2009-12-30
Juni
o
C Hamano
Merge branc
h
'ma
i
nt-1
.
6
.
0'
into maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Junio C Hamano
Re
m
ove http
.
aut
h
A
n
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-28
Junio C Hama
n
o
Merge
bran
c
h '
j
k/1
.
7
.
0-status'
commit
|
commitdiff
|
tree
2009-12-28
Juni
o
C
H
amano
Merge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2009-12-27
Jun
i
o C Ham
a
no
Merge br
a
nch 'nf/maint-
f
ix-index-ext-
l
en-on-be
6
4'
into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Hamano
Makefile
:
FreeB
S
D (both 7 a
n
d 8) needs
O
L
D_ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
Start 1
.
6
.
6
.
X mainte
n
ance
t
r
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
M
er
g
e branch 'jc
/
mai
n
t-
o
bsd46' into maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Kic
k
off 1
.
7
.
0 cy
c
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge branch 'gb/1
.
7
.
0-d
i
ff-
w
hitespace-on
l
y-output'
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Ham
a
no
Merge bra
n
c
h
'
j
c/1
.
7
.
0-d
i
f
f
-whi
t
espac
e
-only-stat
u
s'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge br
a
n
c
h '
j
c/1
.
7
.
0-push-safety'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Ha
m
ano
Merge b
r
anch 'jc/1
.
7
.
0-
s
end-email-no-thread-d
e
fa
u
lt'
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
H
amano
Merge
branch 'sr/vcs-he
l
per'
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Hamano
t4019 "g
r
ep
"
portab
i
lity f
i
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t1200: w
o
rk
a
r
ound a bu
g
in
s
ome implement
a
tions of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
rerere: remove
s
illy 1024-byte l
i
ne l
i
mit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resolve-undo: teach "update-inde
x
--unr
e
solve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
r
esolve-undo: "checko
u
t -m
path" uses r
e
s
olve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C
Hama
n
o
resolve-und
o
: al
l
ow plumb
i
ng
to c
l
ear the inf
o
rmati
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next