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
conflict-marker-size: add test and docs
2010-01-12
Jun
i
o
C
Ha
m
ano
strbuf
.
c: r
e
move
unu
s
e
d
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
un
i
o C Hamano
sha1_
f
ile
.
c: re
m
o
ve unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
mailmap
.
c
:
r
em
o
ve unus
e
d
functi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hama
n
o
utf8
.
c
:
m
a
rk file-
l
ocal
function
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
submodule
.
c: mark
f
ile-local
fu
n
ction sta
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o
C Ham
a
no
quote
.
c: mark fil
e
-local functi
o
n
s
t
atic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C
H
am
a
no
remote-curl
.
c: m
a
rk fil
e
-
local function sta
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
re
a
d-ca
c
he
.
c: mark fil
e
-local function
s
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
p
a
rse-opt
i
ons
.
c: m
a
rk file-local fu
n
ction static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Haman
o
e
n
try
.
c: mark file-local
function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio
C
H
a
mano
http
.
c: m
a
r
k file-
l
o
c
al functions st
a
t
ic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
un
i
o C Hamano
Merge br
a
n
c
h
'jc/maint-1
.
6
.
4
-gr
e
p-lookahead' into
j
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
ni
o
C H
a
mano
g
r
ep: optimize built-i
n
grep by s
k
ipping li
n
es th
a
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C H
a
m
ano
grep: -L shou
l
d sh
o
w em
p
ty
f
iles
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
pret
t
y
.
c: mark file-local fu
n
ction s
t
ati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
built
i
n-rev-list
.
c: mark
fi
l
e-local function
static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
u
n
i
o C
Hamano
b
i
s
e
ct
.
c: mark fi
l
e
-
local
function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
Ju
n
io C Hamano
r
ere
r
e forget
p
ath: forget
r
ecorded resoluti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-11
J
unio
C
Hamano
rer
e
re: re
f
ac
t
or rerere
l
ogic to
m
ake it independent
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C
Hama
n
o
ident
.
c: treat $EMAIL as
giving user
.
e
m
a
il identity
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
J
unio C H
a
mano
ident
.
c: c
h
eck exp
l
i
c
it iden
t
ity for name and em
a
il
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge
bra
n
ch 'tr/http-upda
t
es'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge branch 'jk/mai
n
t-1
.
6
.
5
-reset-ha
r
d'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Mer
g
e branch '
j
k/push-to-delete'
commit
|
commitdiff
|
tree
2010-01-10
J
unio C Ha
m
ano
Merge
b
ranch 'mm/config-
p
ath'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Hamano
Merge
bra
n
c
h
'pm/cvs-environ'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ham
a
no
Mer
g
e
branch 'tr/maint-1
.
6
.
5-bash-pr
o
mpt-
s
how-sub
m
odule
.
.
.
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Hamano
Merge
branch '
b
g/maint
-
rem
o
te-
u
pda
t
e-defaul
t
'
commit
|
commitdiff
|
tree
2010-01-10
Junio
C Hamano
Merg
e
branch '
m
m/diag-path-i
n
-treeish
'
commit
|
commitdiff
|
tree
2010-01-10
Ju
n
io C Hamano
Merge branch
'fc
/
opt-q
u
i
e
t
-
gc
-
reset'
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-10
Junio C Ha
m
ano
M
erge
b
ranch
'm
a
int-1
.
6
.
2' into main
t
commit
|
commitdiff
|
tree
2010-01-10
J
u
nio
C
Hamano
Merge branch
'
m
ai
n
t-1
.
6
.
1' into ma
i
n
t
-1
.
6
.
2
commit
|
commitdiff
|
tree
2010-01-10
Junio C H
a
m
a
no
Merge branc
h
'
m
ai
n
t-1
.
6
.
0
' int
o
mai
n
t
-
1
.
6
.
1
commit
|
commitdiff
|
tree
2010-01-09
J
u
ni
o
C Hamano
ls-files: fi
x
overeager paths
p
ec
o
ptimization
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Hamano
read
_
d
i
rec
t
ory()
:
fur
t
he
r
split treat_pa
t
h()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C
H
amano
read_directory_
r
ecursive(): refactor
handl
i
ng
of a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-09
Junio C Ha
m
ano
t3001
:
test ls-f
i
l
e
s
-o ignored/di
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-08
Jun
i
o C Hamano
ide
n
t
.
c: remove unused v
a
r
iables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
unio C Hamano
Descri
b
e seco
n
d batch
for 1
.
7
.
0 in draft relea
s
e notes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-07
J
u
n
io C
Ham
a
no
Merge br
a
nch
'js/filter-branch-p
r
i
m
e'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C Hamano
Merge branch 'sb/maint-o
c
topus'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Haman
o
Merge b
r
anch
'mg/tag-d-show'
commit
|
commitdiff
|
tree
2010-01-07
Junio C
Hamano
Merge branch 'so/cvsse
r
ver-update'
commit
|
commitdiff
|
tree
2010-01-07
J
unio C
H
aman
o
Merge bran
c
h 'bg/maint-add-all-do
c
'
commit
|
commitdiff
|
tree
2010-01-07
Junio
C Hamano
Merge
b
r
anch 'mv
/
commit-da
t
e
'
commit
|
commitdiff
|
tree
2010-01-07
Junio C Hama
n
o
Me
r
ge branch 'mo/b
i
n-wrappers'
commit
|
commitdiff
|
tree
2010-01-07
Juni
o
C Ha
m
an
o
checkout -m: d
o
not try
to fall back to --me
r
ge from
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio C Hamano
chec
k
out
-m path:
fix recreating conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-06
Junio
C
H
ama
n
o
.
gitattrib
u
tes: dete
c
t
8
-spac
e
i
nd
e
n
t in shell
s
cr
i
pts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Jun
i
o
C Ham
a
no
Fix bit assi
g
nme
n
t for CE_CONFLICT
E
D
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-04
Jun
i
o C Hamano
"reset --merge": fix
u
nmerged c
a
se
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-03
Junio C H
a
mano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2009-12-31
J
uni
o
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-12-31
Juni
o
C Hamano
Merge branch
'maint-1
.
6
.
0'
i
nto maint
commit
|
commitdiff
|
tree
2009-12-30
Junio
C
Hamano
M
erge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2009-12-30
Junio C Ha
m
a
no
Me
r
ge branch 'maint-
1
.
6
.
1' into maint
commit
|
commitdiff
|
tree
2009-12-30
Junio C Hamano
Mer
g
e branc
h
'
m
aint-1
.
6
.
0' i
n
to maint-1
.
6
.
1
commit
|
commitdiff
|
tree
2009-12-29
Junio C Hamano
Remov
e
http
.
au
t
hAny
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-28
Junio C
Hamano
Merge branch '
j
k/1
.
7
.
0-status'
commit
|
commitdiff
|
tree
2009-12-28
Junio C
H
a
man
o
Mer
g
e branch
'
maint
'
commit
|
commitdiff
|
tree
2009-12-27
Jun
i
o C
H
amano
Mer
g
e branc
h
'nf/maint-fix-index-ext-len-on-be64'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
Merg
e
br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Makefi
l
e: F
r
ee
B
S
D
(both 7
a
nd 8) n
e
eds OLD_ICONV
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Start
1
.
6
.
6
.
X mainten
a
nce track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Jun
i
o C Hamano
Merge b
r
anc
h
'
jc/maint-obs
d
46' int
o
maint
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
Kick off 1
.
7
.
0 c
y
cl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
ni
o
C
Haman
o
M
erge bra
n
ch 'gb/1
.
7
.
0
-di
f
f
-
w
hitespace-
o
nly-output'
commit
|
commitdiff
|
tree
2009-12-26
J
u
ni
o
C Ham
a
no
Merge b
r
a
nch 'jc/1
.
7
.
0-diff-whitespa
c
e-only-status'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Hamano
M
e
rg
e
branch 'jc/1
.
7
.
0-push
-
safety'
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio C Hamano
Merg
e
bran
c
h 'jc
/
1
.
7
.
0-se
n
d-email-no-threa
d
-
default'
commit
|
commitdiff
|
tree
2009-12-26
Junio C
Haman
o
Merge
branch
'
sr/vcs-helpe
r
'
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t4019 "
g
rep"
p
o
rtability fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
t1200: work ar
o
u
nd a bug i
n
so
m
e
i
mplementati
o
ns of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio
C
Hamano
r
e
rere: remove
silly 1024-b
y
te lin
e
limit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Juni
o
C
Hamano
resolve
-
u
ndo: teach "update-index
-
-
unresolve" to use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
resol
v
e
-
u
n
do: "
c
heckout -m path" use
s
resolve-undo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C H
a
mano
r
e
s
o
l
ve-undo: allow plu
m
bing to
clear the informatio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C
H
amano
resolve-un
d
o: basic t
e
sts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
J
u
nio
C
H
a
mano
resolve-undo: record res
o
lved conflicts in a n
e
w
i
ndex
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-26
Junio C Hamano
bui
l
tin-
m
erge
.
c:
use st
a
ndard ac
t
ive_cache macros
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-23
Junio C Hamano
Git
1
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-22
Junio
C
Hamano
Merge
branch '
m
aint'
commit
|
commitdiff
|
tree
2009-12-20
Ju
n
io
C
Ham
a
no
Git 1
.
6
.
6-
r
c4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-20
Junio C Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2009-12-16
Juni
o
C
Haman
o
Git 1
.
6
.
6-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C
Hamano
Merge
b
ranch 'main
t
' to sync with 1
.
6
.
5
.
7
commit
|
commitdiff
|
tree
2009-12-16
Ju
n
io C
H
a
m
ano
Git 1
.
6
.
5
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-16
Junio C Hamano
w
ork
t
ree: don't
s
e
gfault with an absolute pathspe
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C
H
amano
s
tatus/commit: do not suggest "reset
HEAD <pa
t
h>"
whil
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Junio C
H
amano
commit/status: "git add <path
>
"
i
s not neces
s
ari
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-12
Jun
i
o
C Hamano
comm
i
t/sta
t
us: check $GIT_DIR/MERGE_H
E
AD o
n
ly
o
nce
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
u
nio C Hamano
Update Release Notes for 1
.
6
.
6
t
o
r
e
move
old bugfixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-11
J
uni
o
C Hamano
Sy
n
c with
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Junio C Hama
n
o
Git
1
.
6
.
5
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
J
u
nio
C Hamano
F
ix archi
v
e format
w
ith -- on
th
e
command line
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Remove post-upload-ho
o
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-10
Jun
i
o C Hamano
Git 1
.
6
.
6-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2009-12-09
Junio C Haman
o
Merge git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2009-12-09
Junio
C Hamano
Merge
git:/
/
git
.
k
e
rnel
.
org/pub
/
scm/git
k
/gitk
commit
|
commitdiff
|
tree
next