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
cherry-pick: Suggest a better method to retain authorship
2007-03-04
Junio C Hamano
Me
r
ge branch 'j
s
/
dif
f
-ni' (early part)
commit
|
commitdiff
|
tree
2007-03-04
J
uni
o
C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-03
Junio C
H
a
mano
gi
t
-merge:
fail
c
orrectly when
w
e cannot
f
as
t
forwa
r
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Ju
n
i
o C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hama
n
o
Merge branch 'js/
c
ommit-format'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hama
n
o
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
i
o
C
H
amano
Add recent changes
t
o draft
1
.
5
.
1
re
l
e
ase n
o
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'js/commit
-
by-name
'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Hamano
Merge bran
c
h
'
j
s/bundle
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge b
r
anc
h
'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Start preparing Release Note
s
for
1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Doc
u
mentation:
git-remote add [-t <branch>] [-m <
b
ranch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
un
i
o
C
Ham
a
no
index_fd():
c
onvert blob onl
y
if it is a regu
l
ar fi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
i
n
d
ex
_
fd(): pass o
p
t
i
onal path paramet
e
r
as hint for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio
C H
a
mano
inde
x
_fd(): use enum object_t
y
pe instead of typ
e
na
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Haman
o
Me
r
ge
branc
h
'np/types
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Mer
g
e branch '
m
c
/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge bran
c
h 'js/diff-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Ham
a
no
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
Make 'cvs
c
i'
l
ockless in git-cvsserver by using gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Ju
n
io C Ha
m
ano
Me
r
ge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Ham
a
no
g
it-apply
:
do not fix wh
i
tespaces on con
t
ext lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio
C
H
amano
M
erge
branch 'm
a
ster' into
j
s/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ha
m
a
n
o
Do
c
umentation: link in
1
.
5
.
0
.
2 material
to the top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C
H
amano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
H
a
m
ano
Docum
e
ntation
:
describe
"-f/-t/-m"
o
ptions to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hamano
diff --cc: fix display
o
f sy
m
li
n
k
c
onflicts duri
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
ni
o
C Hamano
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch '
j
c/merge-symlink' into
mai
n
t
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Ham
a
no
merge-recursive: fix long
s
ta
n
ding b
u
g in m
e
rging
s
y
m
links
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merg
e
-
i
n
d
ex: fix longstanding bug in me
r
ging sym
l
inks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C
H
amano
diff --cached:
g
ive
m
o
re se
n
sib
l
e e
r
ror message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Hamano
M
e
rge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hama
n
o
Add
Rele
a
se
N
ot
e
s to prepare for
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
r
erere
:
d
o
no
t
deal
w
ith s
y
mlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
re
r
ere:
d
o not skip two conflicted
p
aths next to e
a
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hama
n
o
Merge gi
t
:
//repo
.
or
.
cz/git-gui i
n
to ma
i
nt
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Do
n
't modify CREDITS-FILE if it h
a
s
n't ch
a
n
ge
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
E
v
i
l Merge branc
h
'jc/s
t
atus' (e
a
rly part) into
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio
C Ha
m
a
no
Merge
b
ranch
'js/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Me
r
ge branch 'js/no-limit-bou
n
da
r
y
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
M
erge bra
n
ch 'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Ham
a
no
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
d
i
ff-
p
atch
:
Avoid e
m
itting double-slas
h
es in
t
e
x
tua
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C H
a
m
ano
bundle: rew
o
rd m
i
ssing prerequisite error message
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o C
H
amano
Reword gi
t
-am 3-way fa
l
lback failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hama
n
o
.
mai
l
m
ap mainten
a
nc
e
a
f
te
r
pul
l
ing from g
i
t-s
v
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
J
unio C Hamano
Mer
g
e branches 'lt
/
c
rlf' and
'jc/apply
-
config'
commit
|
commitdiff
|
tree
2007-02-23
Junio
C H
a
man
o
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
ru
n
_diff_{files
,
ind
e
x}():
update calling convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
J
u
n
io
C Hamano
u
p
date-index: do
n
ot
d
i
e
too earl
y
in a read-only
r
eposit
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
Hamano
git-st
a
tus
:
do not be to
t
ally useless
i
n a read-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C Hamano
t
4119:
t
est autocomputi
n
g -p<n> for t
r
aditional di
f
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Haman
o
git-appl
y
:
g
uess correct -p<n> v
a
l
u
e for
non-git p
a
tches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Hamano
g
i
t-apply:
notice "
d
if
f
--git" pa
t
ch again
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch
'
master' of
git:/
/
r
epo
.
or
.
c
z
/git-gui i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix bot
c
h
ed "leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
t4119
:
ad
d
test for traditional patch
and di
f
ferent
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
amano
Merge branch '
f
k/aut
o
conf'
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Haman
o
Merge branch 'js
/
name-re
v
-fix'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hama
n
o
prefixcmp(): fix-up leftover strncmp(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
ni
o
C Hama
n
o
p
r
e
f
ixc
m
p(): fix-up m
e
chanical conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C H
a
mano
M
e
chanical conversion to use prefix
c
m
p
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Hamano
Add p
r
efix
c
mp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C Hamano
Link 1
.
5
.
0
.
1
documentation from th
e
main page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
git
-
apply:
r
equi
r
e
-
p<n> when working in a s
u
bdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C Hamano
git-apply:
do not lose cwd when run from a
s
ubdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge
b
ra
n
ch 'js/diff-c
o
lor-check'
commit
|
commitdiff
|
tree
2007-02-20
J
unio C Hama
n
o
Merge branch 'j
c
/fetch-notags'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C Hamano
Merge bran
c
h
'ap/cv
s
se
r
ver'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ham
a
no
Merge bra
n
ch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-02-19
Jun
i
o C
H
amano
GIT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Tea
c
h '
g
it apply'
to look at $HOME/
.
g
itconfig
e
v
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
Hamano
Up
d
a
te draft release
n
otes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
u
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-18
J
unio C Hamano
U
p
date draft release notes for
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Hamano
Me
r
ge git://git
.
kernel
.
org/pub/scm/
g
itk/gitk int
o
main
t
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
H
amano
Tea
c
h core
.
a
u
t
ocrlf
t
o 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
J
u
ni
o
C
Hamano
Teach
'
git apply' to look at $GI
T
_
DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C Hamano
Do no
t
take mode bits f
r
om index after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
J
u
n
io C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
J
u
nio C Hama
n
o
g
it-merge
:
minor fix for no
_
t
r
i
v
ial_merge_st
r
a
t
egies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio
C
H
am
a
no
Merge branch
'm
a
int
'
commit
|
commitdiff
|
tree
2007-02-16
Junio
C
Hama
n
o
pre
t
end-
s
ha1: grave bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio
C
Ham
a
n
o
remotes
.
n
ot-o
r
igin
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Me
r
g
e
b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
GIT-VER
S
IO
N
-FILE:
check
.
/version fir
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hama
n
o
t0020: add te
s
t for au
t
o
-c
r
l
f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
Hamano
[PATCH] gitk:
U
se show-ref in
s
tead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
uni
o
C
Haman
o
[P
A
TCH] Make gitk work rea
s
onably wel
l
on Cygw
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Haman
o
Make sure packedgitwindowsize is multiple of (page
s
iz
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C
H
a
m
a
no
Add RelNotes 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
ma
n
o
Stil
l
u
pdating 1
.
5
.
0 release n
o
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Haman
o
Cla
r
ify two
backward incompat
i
ble rep
o
sitory o
p
t
i
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hamano
Point top-level Re
l
Notes link a
t
1
.
5
.
1 release no
t
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
n
o
Add RelNotes
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next