repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/symlink'
2007-03-05
Ju
n
io C Hamano
Me
r
ge branch
'
js
/
sy
m
link'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio C Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
d
i
ff-ni:
allow r
u
nn
i
ng from
a
subd
i
r
e
ctory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge branch 'js/dif
f
-ni' (ea
r
l
y part)
commit
|
commitdiff
|
tree
2007-03-04
Juni
o
C Hamano
Me
r
ge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-03
Junio C
Hamano
git-mer
g
e
:
fail correctly when we
canno
t
fast forward
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Juni
o
C
H
amano
Merge branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge br
a
nch 'js/commit-for
m
a
t
'
commit
|
commitdiff
|
tree
2007-03-02
Junio C H
a
mano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Add
recent chan
g
e
s to
d
raft 1
.
5
.
1
r
ele
a
se notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
Merge branch
'
j
s
/commit-by-name
'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C
H
amano
Merge branch '
j
s/
b
undle'
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Ha
m
ano
M
erge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-28
J
uni
o
C Haman
o
Start
pre
p
aring Release Notes
f
or 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Ham
a
no
Documentati
o
n: git-remo
t
e ad
d
[-
t
<branch>] [
-
m <branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C Hamano
index_fd(): co
n
vert blob o
n
ly
i
f it is
a
regula
r
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
index_fd(): pass opt
i
onal path parameter as hin
t
f
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Ha
m
ano
index_fd(): use enum object_type i
n
stead of type name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o
C
Hamano
Merge
br
a
n
c
h
'np/t
y
p
es'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
erge branch 'm
c
/
s
endmail'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Haman
o
Merge
branch 'js/diff-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
M
erge
bra
n
ch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-02-27
J
unio C
H
a
ma
n
o
Make 'cvs ci' lockless in g
i
t-cvsserver by using git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
M
erge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
a
no
git-apply: do not
f
ix whitespaces on
context
l
ines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Mer
g
e branch 'mas
t
er'
i
nto js/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C
H
amano
Docum
e
ntation: link
i
n
1
.
5
.
0
.
2
material to
t
he top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hama
n
o
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
GI
T
1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ham
a
no
Documentation: descr
i
be "-f/-t/-m"
o
ptions to "gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ha
m
ano
diff --cc: fix disp
l
ay of s
y
mlin
k
conf
l
icts duri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
mano
Merge branch 'j
c
/merge-
s
ymlink
'
in
t
o
maint
commit
|
commitdiff
|
tree
2007-02-26
Jun
i
o C Hamano
m
erge-recursive: fix longstan
d
ing
bug in merging sym
l
inks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ham
a
no
me
r
g
e
-index: f
i
x longstan
d
ing bug in merging symlink
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
diff --cache
d
: give more s
e
nsible
e
rror
message when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
m
a
n
o
A
d
d Release
Notes to
p
repare
for 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ham
a
no
rerere
:
do not deal with sy
m
li
n
ks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
am
a
no
rerere: do
no
t
skip two co
n
flicted pa
t
hs next to
e
ac
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
un
i
o C Ham
a
no
Me
r
ge git:/
/
r
ep
o
.
or
.
cz/git-gui
i
n
to maint
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C
H
amano
Don't mo
d
i
fy CREDITS-FILE if it hasn't changed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
E
vil Merge branch 'jc/status' (e
a
rly part) i
n
to js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
J
un
i
o C Hamano
Mer
g
e
branch 'js/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Haman
o
Merge
bra
n
ch 'js
/
no-limit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
Merge b
r
anc
h
'js/e
t
c-conf
i
g'
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io
C
Hamano
Merge
b
r
anc
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
amano
d
iff-
p
a
t
ch: Avoid emi
t
t
ing
double-
s
lashe
s
in textual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
bundle: rewo
r
d
missin
g
prerequisite error message
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Reword git-am 3-w
a
y fallback failure
m
e
ssage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
.
ma
i
lma
p
m
ainte
n
an
c
e after pulling
f
rom
g
it-svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C H
a
mano
Merge branches 'lt/crlf'
a
nd 'jc/
a
pply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
amano
Merge
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-22
J
unio C Hamano
run_diff_
{
files,index}():
update call
i
n
g
convention
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C Hamano
u
p
d
ate-index: d
o
not die too early in a r
e
ad-only repos
i
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
H
a
m
a
no
git-status
:
d
o
no
t
be t
o
tally u
s
e
l
ess in a
r
ead-only
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C Hamano
t
4
119: test autocom
p
u
t
in
g
-p<n> for traditiona
l
diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C Hamano
git-apply: g
u
ess
c
orrect -p
<
n> value for non-git patches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
J
uni
o
C
Hamano
git
-
apply: notice "diff --git" patc
h
again
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-21
Junio C Hamano
Me
r
g
e branch 'master' of git://re
p
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Ham
a
n
o
Fix botched
"
l
e
ak fix"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C
Haman
o
t
4
119:
a
dd t
e
st for traditional
pa
t
c
h
and diff
e
rent
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
erge
b
ranc
h
'fk/autoc
o
nf'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hama
n
o
M
erge b
r
anch 'js/name-rev-f
i
x
'
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
amano
pre
f
i
xcmp(): fix-up l
e
ftov
e
r str
n
cmp()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io
C
H
a
mano
pr
e
fixcmp(): fix-up mec
h
anica
l
c
o
n
version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
echanical conversion t
o
use prefixcmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Add pr
e
f
i
xcmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Link 1
.
5
.
0
.
1 document
a
tion from the main pag
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio
C Hamano
gi
t
-apply: requi
r
e -p<n>
w
hen w
o
rking in
a
su
b
d
i
r
ectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Hamano
g
it-app
l
y: do
n
ot
l
ose cwd when ru
n
f
r
om
a
subdirecto
r
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Hamano
Merge branch 'js/dif
f
-color-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge b
r
a
nch 'jc/fetch-nota
g
s'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Hamano
M
e
r
ge b
r
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge b
r
anch 'ap/cvsse
r
v
er'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
G
I
T
1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
J
u
n
i
o
C
Hamano
T
e
ach 'git ap
p
ly' to look at $HOME/
.
gitconfig even
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Up
d
ate draft release
no
t
es for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Merg
e
b
r
an
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Hamano
Update draft release note
s
for
1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Ha
m
ano
Merge git://git
.
kernel
.
org/pub/scm/gi
t
k/gi
t
k into maint
commit
|
commitdiff
|
tree
2007-02-17
Jun
i
o
C Hamano
Teach c
o
r
e
.
auto
c
rlf
t
o 'git apply'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Ju
n
io
C
Hamano
Teach 'git appl
y
' to
l
o
ok a
t
$
G
I
T_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C Hama
n
o
Do not ta
k
e mode bi
t
s f
r
om ind
e
x
a
f
ter type change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
Merge b
r
anch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-16
Jun
i
o C Hamano
git-mer
g
e
:
m
inor fix for no_triv
i
al_merge_strategies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Haman
o
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Jun
i
o C H
a
mano
pretend
-
s
ha
1
:
grave bugfix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-15
Juni
o
C
Hama
n
o
r
em
o
tes
.
not-origin
.
t
agopt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
G
I
T-VERSI
O
N-FILE: check
.
/vers
i
on fi
r
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Haman
o
t0020: add t
e
s
t
f
or auto-crlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
no
[
PA
T
CH] gitk
:
Use show-ref instead of ls
-
remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
Hamano
[PATC
H
] Make gitk work rea
s
ona
b
l
y
w
el
l
on Cygwin
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
M
a
ke sure
p
ackedgitwindowsize is multiple
o
f
(page
s
ize
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
A
d
d R
e
lNotes 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next