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
Junio C Hamano
conflict-ma
r
ker-size:
new at
t
ri
b
ute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
rerere
:
use ll_merge() instead of u
s
ing
x
dl_mer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
merge-tree
:
use
ll_
m
erge(
)
n
o
t
x
dl_m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C
H
amano
xdl_merge(): all
o
w passing down marker
_
s
i
ze in xmparam_
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): introduce xmparam_t fo
r
me
r
ge sp
e
cific
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
git
_
attr(): fix func
t
ion signatu
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
mano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge branch 'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Teach diff that mo
d
if
i
ed submodul
e
direc
t
o
r
y
is
d
ir
t
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
H
ama
n
o
grep --
n
o-index: al
l
ow use of "git g
r
e
p" outside a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Juni
o
C Ham
a
no
grep: prep
a
re
to run outside
of a work tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch 'jc/checkout-me
r
ge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C H
a
m
ano
Mer
g
e bra
n
ch '
r
s/maint-arc
h
i
v
e-matc
h
-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io C Hama
n
o
Merge b
r
anch 'il/vcs-hel
p
er'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Haman
o
st
r
buf_addb
u
f():
a
ll
o
w
pass
i
ng the same
b
uf
t
o dst
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
erge
b
ranc
h
'cc/reset-
m
ore'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
M
e
rge br
a
nch
'
nd/spars
e
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C
H
amano
t
7
502: te
s
t c
o
mmit
.
status, --s
t
atus and
-
-n
o
-
status
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Ha
m
ano
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:
r
ip ou
t
s
upport for
external grep
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C H
a
mano
Merge
b
r
a
n
ch
'maint'
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
strbuf
.
c: remove unuse
d
function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Ha
m
ano
sh
a
1_
f
ile
.
c: r
e
move un
u
sed
funct
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
mailmap
.
c: re
m
ove unused functio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
ma
n
o
utf
8
.
c: mark fil
e
-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C Hamano
submodule
.
c: mark
f
i
l
e-local funct
i
on static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
amano
q
u
ote
.
c:
m
ark fil
e
-local funct
i
on stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
remote-
c
u
r
l
.
c: mar
k
f
i
le-local funct
i
o
n
static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
uni
o
C Haman
o
r
e
ad-cache
.
c:
mark fil
e
-
loca
l
f
unc
t
ions static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
u
ni
o
C Hamano
parse-o
p
tions
.
c: m
a
rk fi
l
e-l
o
c
a
l
f
u
n
cti
o
n
s
tatic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C
Hamano
entry
.
c: mark
file-lo
c
al function sta
t
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
H
a
m
ano
htt
p
.
c: mark file-l
o
cal functions sta
t
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
mano
Merge
branch
'jc/maint-
1
.
6
.
4-grep-lookahead'
i
nto jc
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
grep: op
t
im
i
ze
b
u
i
lt-in grep by skipping lines that
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Ha
m
ano
g
rep: -L should show
e
mpty
f
i
l
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hama
n
o
p
r
ett
y
.
c: mark file-local function static
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C Hamano
builtin-rev-list
.
c: mark file-l
o
cal func
t
ion stat
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-12
Juni
o
C Hamano
bisect
.
c: mark f
i
le-loc
a
l
fu
n
ction st
a
tic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio C Ham
a
no
rerere forget path: for
g
et recorded resolution
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-11
Junio
C Ham
a
no
rerere: ref
a
ctor rerere l
o
gic to make it
i
ndepend
e
nt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
Junio
C
Hamano
ident
.
c: treat $EMAIL as giving
u
s
er
.
e
mail identi
t
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C
H
aman
o
ident
.
c:
c
he
c
k
e
x
plici
t
identity for name an
d
emai
l
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Hamano
Merge bran
c
h
'tr/http-
u
pdates'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
M
e
r
ge
b
ranch 'jk/maint-1
.
6
.
5-rese
t
-hard'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'jk/push-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
Me
r
ge
b
r
a
n
c
h
'mm/co
n
fig-
p
ath'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C
H
a
m
a
no
M
erge b
r
anch 'pm/cvs-environ'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Me
r
ge b
r
anch
't
r
/maint-1
.
6
.
5-bash-prompt-sho
w
-
s
ubm
o
d
u
le
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merge bran
c
h 'bg/maint-
r
emote-u
p
d
at
e
-defau
l
t
'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hama
n
o
Merge b
r
anch 'mm/diag
-
p
ath
-
in-treeis
h
'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merge branch 'fc/opt-quiet-
g
c-r
e
set'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Juni
o
C Ham
a
no
Merge br
a
n
c
h 'maint
-
1
.
6
.
2' into maint
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch
'm
a
int-1
.
6
.
1' into
maint-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio C Ham
a
no
M
erge branch '
m
aint
-
1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
J
uni
o
C Hamano
ls-files
:
fix overeager pathsp
e
c o
p
timization
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
Junio
C Hamano
re
a
d_dir
e
ct
o
ry()
:
further split treat_pa
t
h
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
J
u
nio
C Hamano
r
ead_
d
irectory_recursive(): refa
c
tor handling of
a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-09
J
unio
C Hamano
t3001: t
e
st ls
-
f
i
l
es -o i
g
nored/dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-08
Junio C H
a
mano
iden
t
.
c: remove unused variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Jun
i
o
C Ha
m
ano
Describ
e
second batch for 1
.
7
.
0 in draft r
e
l
e
ase notes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merg
e
branc
h
'j
s
/f
i
l
t
er-branch-prime'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge bran
c
h 'sb/maint-octopus'
commit
|
commitdiff
|
tree
2010-01-07
Ju
n
io C Hama
n
o
M
e
rge branch 'm
g
/ta
g
-d-show'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge
bra
n
ch '
s
o/cvsserve
r
-update
'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Hamano
Merge
branch '
b
g/maint-add-all-doc'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hamano
Merge branc
h
'mv/co
m
mit-
d
ate'
commit
|
commitdiff
|
tree
2010-01-07
Junio C H
a
mano
Merge branch 'mo/bi
n
-wr
a
pp
e
rs'
commit
|
commitdiff
|
tree
2010-01-07
Junio C H
a
mano
checkout -m: do
n
ot try
t
o fall ba
c
k to --merge
f
rom
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Ha
m
ano
check
o
ut -m path: fix rec
r
e
a
ting conf
l
icts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
.
gitattributes: detect 8-spa
c
e i
n
dent in s
h
ell
scripts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C Hamano
Fix bit a
s
signm
e
nt fo
r
CE_CONFLIC
T
ED
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-04
Junio C
Haman
o
"res
e
t --merge": fix unmerged cas
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-03
Junio C Ha
m
an
o
Me
r
ge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
Junio C Hamano
M
erge branch 'maint-
1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C H
a
ma
n
o
Merge branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
br
a
nch -d: base
the "already-merg
e
d
"
safety on the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Mer
g
e
bra
n
c
h 'maint-1
.
6
.
1' into
maint
commit
|
commitdiff
|
tree
2009-12-30
J
u
n
i
o C Hamano
Merge branch 'maint-1
.
6
.
0' into m
a
int-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
J
u
nio
C Hamano
Remove
h
ttp
.
aut
h
Any
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-28
Junio C Hama
n
o
Merge branch 'jk/1
.
7
.
0-status'
commit
|
commitdiff
|
tree
2009-12-28
Ju
n
io C Ha
m
ano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2009-12-27
Junio C Haman
o
Merge bran
c
h 'n
f
/mai
n
t-fix
-
inde
x
-
e
x
t-l
e
n-
o
n-
b
e
6
4
' into
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2009-12-26
Ju
n
io C Hamano
Ma
k
efile
:
Free
B
SD (bot
h
7
a
n
d
8) n
e
ed
s
OLD_
I
CONV
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
Start 1
.
6
.
6
.
X maintenan
c
e track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ham
a
no
Merge branch
'jc/mai
n
t-obsd46' into main
t
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
K
i
c
k
o
f
f
1
.
7
.
0 cycle
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C Ham
a
no
Me
r
ge branch 'gb/1
.
7
.
0-d
i
f
f-whit
e
space-onl
y
-output'
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o
C
H
a
mano
Merge branch 'jc/1
.
7
.
0-di
f
f-whitespa
c
e-only-status'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Me
r
ge b
r
anch 'jc/1
.
7
.
0-push-safety'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Merge branch 'jc
/
1
.
7
.
0-se
n
d-email-no-
t
hread-defa
u
lt'
commit
|
commitdiff
|
tree
2009-12-26
J
unio C Hamano
Mer
g
e br
a
nch
'sr/vcs-helper'
commit
|
commitdiff
|
tree
2009-12-26
Junio
C H
a
mano
t4019
"
grep
"
p
o
rtability fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
t1200: wo
r
k aroun
d
a bug
in som
e
i
m
plementations of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Ha
m
ano
rerere:
r
emove silly 1024-byte
line limi
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Ham
a
no
r
esolve-
u
nd
o
: teach "update-
i
ndex -
-
un
r
e
s
ol
v
e"
to u
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Ham
a
n
o
r
e
solve-undo:
"
checkout -m path" uses
resolve-und
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hama
n
o
resolve-undo: al
l
o
w
plumbing to clea
r
t
h
e
i
nformat
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next