repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2007-02-26
Junio C Hama
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
a
m
a
no
Merge
b
ranch
'
j
c
/merge-symlink' int
o
m
a
int
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hamano
merge-
r
e
c
ursive: fix longstanding
b
ug in merging s
y
mlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-index: fix lo
n
gstanding
b
u
g
in merg
i
ng symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Ha
m
ano
diff --c
a
ched:
give more sensible error messag
e
wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io
C
H
am
a
no
Add Release Notes to prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Ha
m
a
n
o
rerere: do not d
e
al with sy
m
l
i
nks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io C
Hamano
rerere: do
n
ot
skip two conflicted paths next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Ha
m
ano
Merge git://repo
.
or
.
cz/gi
t
-gui int
o
maint
commit
|
commitdiff
|
tree
2007-02-25
J
unio C Hamano
Don't modif
y
CREDIT
S
-FIL
E
if it hasn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C H
a
mano
M
erge branch '
j
s/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
M
e
rge branch 'js/no-limit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Haman
o
Merge branch 'js/et
c
-confi
g
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge branch
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
diff-patch:
A
void emitting double-slashe
s
in textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Ham
a
no
Reword git-am
3
-way fallback failur
e
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
J
u
nio C Hamano
.
m
a
ilmap maintenance
a
f
ter pull
i
ng from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Mer
g
e bra
n
ches
'lt/crlf' and 'j
c
/apply-con
f
ig'
commit
|
commitdiff
|
tree
2007-02-23
Junio C
Ha
m
ano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
Hamano
t4119:
t
est autocomputing -p<n>
for traditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C Hamano
git-apply: guess correct -
p
<n> val
u
e for
non-g
i
t patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Hamano
git-app
l
y: notic
e
"diff -
-
g
it" patc
h
a
g
ain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Me
r
ge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Ham
a
no
M
erge b
r
anc
h
'master' of git://r
e
po
.
or
.
cz/git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix botched "leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
t411
9
:
add test
f
or traditiona
l
pa
t
ch and
different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Hamano
M
erge branch 'fk/aut
o
conf'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
Mer
g
e branc
h
'js/name-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
H
am
a
no
prefixcmp(): fix-up leftover strnc
m
p()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Hamano
prefixcmp(): fix-up m
e
chanical
conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Mechanical
c
o
nversion to use prefixcmp(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
A
dd
pr
e
fixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Haman
o
Merg
e
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C Hamano
Link 1
.
5
.
0
.
1 documenta
t
io
n
fr
o
m th
e
ma
i
n page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C
H
amano
git-apply:
r
equire -p<n>
w
he
n
wo
r
king in a sub
d
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio C Hamano
git-ap
p
l
y
:
d
o not l
o
se
c
wd wh
e
n run from a sub
d
irec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Hamano
Merge
branch 'js/diff-
c
olor-check'
commit
|
commitdiff
|
tree
2007-02-20
J
unio C
H
amano
Merge branch
'
jc/fetch-notags'
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C Hamano
Me
r
ge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-19
J
u
nio C Hamano
Merg
e
b
r
a
n
ch 'ap/cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Juni
o
C
H
aman
o
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
J
u
nio C Hamano
GIT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
i
o C Hamano
Teach 'git apply' to l
o
ok at
$HOME/
.
gitconfig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
U
p
date draft release
n
o
t
e
s fo
r
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Hamano
Upda
t
e draft release notes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o C Hamano
Merge
g
it://git
.
kernel
.
o
r
g/pub/scm/gitk/g
i
tk into ma
i
nt
commit
|
commitdiff
|
tree
2007-02-17
J
u
nio C Hamano
Teach cor
e
.
au
t
o
c
rlf to 'git
a
pply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
H
amano
Teach 'gi
t
appl
y
' to
lo
o
k at $GIT_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Do not take mode
b
its from ind
e
x
a
f
ter type cha
n
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C
H
a
mano
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio
C Hamano
git-me
r
ge: minor fix for
n
o_trivial_merge_strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
M
erge
b
ran
c
h 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-02-16
Ju
n
i
o C Hamano
p
r
et
e
nd-sha1: grave bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
J
unio C Ha
m
ano
remotes
.
not-origin
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
ma
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
GIT-VERSION-FILE: check
.
/ve
r
sion
first
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
t
0
020: add test
f
or auto-c
r
lf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
ano
[
PATCH]
g
itk:
Use show-ref
i
ns
t
ead of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Ha
m
ano
[
PATCH] Make gitk work rea
s
onably
w
ell o
n
Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio
C
H
ama
n
o
Make sure packedgitwindowsize is m
u
ltipl
e
o
f
(pagesize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C
H
amano
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
mano
Still upda
t
ing 1
.
5
.
0
r
e
l
ease notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
Clarif
y
tw
o
b
a
c
kward
i
n
co
m
pa
t
ibl
e
r
epository optio
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Haman
o
Point top-level RelNotes link at 1
.
5
.
1 release no
t
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ha
m
ano
Add RelNotes 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Documen
t
--ignore-space-at-eol option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Merge br
a
nc
h
'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Haman
o
Makefi
l
e:
u
pda
t
e
c
he
c
k-docs
t
a
r
get
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
cmd
-
l
i
st: add git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Haman
o
Documentat
i
on: Drop
f
u
l
l-stop f
r
om git-f
a
st-impo
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o C Hamano
blame: --
s
how-stats for
ea
s
ier optimization w
o
rk
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
a
m
ano
Merge b
r
anch 'js/
r
everse'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Merge branch 'jc/diff-apply-patch'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Merge branch 'jc/merge-
b
ase' (e
a
r
l
y part)
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C H
a
m
a
n
o
Merge bran
c
h '
j
c/depreca
t
e'
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
a
m
a
no
Add link to v1
.
5
.
0 docume
n
tation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
Hamano
GIT
1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Junio C
Ham
a
no
Add re
l
ease notes to the dist
r
ibuti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Hamano
Me
r
ge branch
'master' o
f
git://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Ha
m
ano
Docume
n
tation: Moving out of detached HEAD does no
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Hamano
"git-
f
e
t
ch
-
-tags
$
URL" shoul
d
not overwrite
exis
t
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ham
a
no
for-e
a
ch-re
f
log:
n
ot
having
$
G
I
T
_D
I
R/logs directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
u
nio C Hamano
Do not forget
t
o
pack ob
j
e
cts reachable from HEAD
r
eflog
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
am
a
no
Rem
o
ve git-
d
iff
-
stages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C Hamano
Re
m
ove git
-
r
e
solve
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Juni
o
C Haman
o
Add RPM
target for
g
it-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ha
m
ano
Merg
e
branch 'master' of git://repo
.
o
r
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
Merge git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio
C
Ha
m
ano
Add discussion section to git-ta
g
documenta
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hamano
T
each git-a
m
to
p
ass -p opt
i
on dow
n
to git
-
a
pply
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hama
n
o
Document
a
tion
:
git-rebase -C<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
J
unio C
H
aman
o
Merge b
r
anch 'master' of gi
t
://re
p
o
.
or
.
cz/git/fasti
m
p
o
rt
commit
|
commitdiff
|
tree
2007-02-11
J
u
n
i
o
C Ham
a
no
t4016: test quoting fu
n
ny pathnames in diff
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Ha
m
a
no
diff_
f
lus
h
_n
a
me(): take
s
tr
u
c
t diff_opt
i
on
s
para
m
e
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Ju
n
io
C Ha
m
a
n
o
wt_status_prepare()
:
c
l
ean up structure initialization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
git-fet
c
h: document au
t
omatic tag followi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio C Hamano
Documenta
t
ion/
g
it-pull: describe def
a
ult
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-09
Junio
C
Hama
n
o
r
eflog: ha
n
d
l
e $name =
>
remotes/
%
s
/HEAD mapping
c
onsi
s
t
ently
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next