repo.or.cz
/
git
/
repo.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge GIT 1.5.0.4
2007-02-25
Junio C
Hamano
r
e
rere: do n
o
t skip two conflict
e
d
paths next
to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
un
i
o C Haman
o
Merge
g
i
t://repo
.
or
.
cz/git
-
gui
i
nto maint
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Ham
a
no
Don't
modify CRE
D
ITS-FILE if it hasn't
cha
n
g
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Haman
o
git-fe
t
c
h-
-
too
l
take
s
f
lags before the
subcommand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o C Hama
n
o
Evil Merge branch
'
jc/s
t
atus' (early part) into js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Merge branch 'js/a
p
ply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
ama
n
o
Mer
g
e branch 'js/no-limit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hamano
Merg
e
branch 'js/etc-
c
onfig'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge bran
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio
C Hamano
diff-patch: Avoid
e
m
i
tt
i
ng double-slashes in
t
extua
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
bu
n
dle: reword mi
s
sing pr
e
requisite error mess
a
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C H
a
mano
R
e
word git-am 3-way fallba
c
k f
a
ilure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
amano
.
ma
i
l
m
a
p ma
i
ntenance after p
u
lling from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
a
m
a
no
Merge bran
c
h
es 'lt/crlf' a
n
d 'jc/ap
p
ly-c
o
nfig
'
commit
|
commitdiff
|
tree
2007-02-23
Juni
o
C Ham
a
n
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hama
n
o
ru
n
_diff_{files,inde
x
}():
u
p
dat
e
calling c
o
nve
n
ti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Ha
m
a
n
o
u
pdate-ind
e
x: do not d
i
e too
e
arly
i
n a read-only re
p
ository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C Hamano
gi
t
-statu
s
: do not b
e
totally useless in a read-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C
Hamano
t41
1
9
:
t
e
st autocomp
u
ting -p<n> for traditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
git-appl
y
:
guess correct
-p<n> value f
o
r non-gi
t
pa
t
ches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ha
m
ano
git-apply: noti
c
e "diff
-
-git" patch ag
a
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C
Hamano
Mer
g
e branch 'master
'
of git://
r
epo
.
or
.
cz/git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Ham
a
no
Fix botched "leak fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
t41
1
9: add test for traditional patch and diffe
r
e
nt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch 'fk/a
u
toconf'
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio
C
Hama
n
o
Mer
g
e bra
n
ch
'
js/
n
ame-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
prefixcmp():
fix-u
p
leftover strncm
p
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Hamano
pref
i
x
c
mp():
f
ix-up
mec
h
anical conve
r
sion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
n
i
o
C
Hamano
Mechanical conversion to use prefi
x
cmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C H
a
m
an
o
Add prefi
x
c
m
p
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
n
i
o
C Ham
a
no
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Link 1
.
5
.
0
.
1 documentation
f
rom the main page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ha
m
ano
git-appl
y
: requ
i
r
e
-
p<n> when wor
k
ing in
a
subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C Hamano
g
i
t-app
l
y: do n
o
t
lose cwd when ru
n
from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ham
a
no
M
e
rge branch 'j
s
/diff-co
l
or-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C
H
am
a
n
o
M
erge branch 'jc/fe
t
ch-notags
'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Mer
g
e branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Haman
o
Me
r
ge branc
h
'ap/cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Junio C
H
amano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C
H
a
m
a
no
GIT
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C H
a
mano
Teach
'
git ap
p
ly'
t
o look at $HOME/
.
gitconfig even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
u
nio C Ham
a
no
Upda
t
e dra
f
t release
n
otes f
o
r 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-02-18
J
unio C Hamano
Update draf
t
rele
a
se
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 Ha
m
ano
Merge g
i
t:
/
/git
.
kernel
.
o
rg/pub/
s
cm/gitk/gitk into
maint
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
H
am
a
no
Teac
h
core
.
autocrlf t
o
'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
Haman
o
Teach
'
gi
t
apply' to look
at $GI
T
_DIR/co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Do not take mode bi
t
s fro
m
index after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio
C
Ha
m
ano
M
e
rg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-16
J
un
i
o
C Hamano
gi
t
-merge
:
minor fi
x
for no_trivial_merge_strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Ha
m
a
n
o
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-16
J
u
nio
C
Hama
n
o
pretend-sha
1
:
grave bugf
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio C
Hamano
r
e
motes
.
not-origi
n
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio
C
Ham
a
n
o
Merge
b
ra
n
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Ha
m
ano
GIT-
V
ERSION-FILE: ch
e
ck
.
/versio
n
f
irst
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C
Hamano
t0020: ad
d
test f
o
r auto
-
c
rlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C H
a
ma
n
o
[PATCH] gitk:
Use show
-
ref instead
of ls-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C H
a
m
a
no
[
PATCH] Make gitk work reasonably
w
e
ll on Cygwin
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Make s
u
r
e packedgi
t
wi
n
dows
i
ze is multiple
o
f
(p
a
gesize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Add RelNot
e
s 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hama
n
o
Still updating 1
.
5
.
0 release
n
o
t
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Clar
i
fy tw
o
backward incompa
t
i
ble repos
i
tory opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C H
a
mano
Poi
n
t top-level Re
l
No
t
es link
a
t
1
.
5
.
1 rele
a
se not
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
no
Ad
d
RelNotes 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Doc
u
ment --ignore-space-at
-
eol option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hama
n
o
Makefile:
u
pdate check-docs tar
g
et
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
cmd-l
i
st:
a
dd
g
it-remo
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C Ha
m
ano
Documen
t
ation: Drop fu
l
l
-stop from git
-
fast-import
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
H
a
mano
git-fetch: rewrite expand_
r
ef
_
wildcard in C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
g
i
t-
f
e
t
ch:
r
e
w
rit
e
ano
t
her
shell l
o
op in
C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C H
a
mano
git-fetch: move more
code into C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o
C H
a
mano
git-fetch--tool: s
t
art rewriting par
t
s
o
f git-f
e
tch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
git
-
fetch: spli
t
fetc
h
_main int
o
fetch_dumb and fetch_native
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
blame: --
s
how-st
a
ts for easier opti
m
iz
a
tion work
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Ham
a
n
o
Merge branch
'
js/reverse'
commit
|
commitdiff
|
tree
2007-02-14
Juni
o
C Hamano
Merge
b
ranch 'jc/diff-apply-patch'
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Merge
branch 'jc/merge-ba
s
e' (early par
t
)
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Haman
o
Merge branch 'jc/deprec
a
te'
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio
C
Hamano
Add link t
o
v
1
.
5
.
0
d
ocume
n
tation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o
C Hamano
G
I
T
1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
J
u
nio C Hamano
Add
r
e
lease notes
t
o the
distribution
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
unio C
H
amano
M
e
rge branch 'maste
r
'
of
g
it://repo
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio C
Ham
a
no
Documentation: Movi
n
g ou
t
of detac
h
ed
HEAD
does
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hama
n
o
"
git-fet
c
h --tags $URL
"
s
hould not overwrit
e
existing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio
C Hamano
for-each
-
reflog:
not having $GIT_DIR/
l
o
gs d
i
r
e
ctor
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
Do not forget to
pack objects reachable from H
E
AD reflog
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Ham
a
no
Remove git
-
diff-
s
tages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
u
ni
o
C Hamano
R
e
move g
i
t-
r
esolve
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C
H
amano
Add R
P
M
target for
g
it-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
M
erge branch 'm
a
ster'
o
f
git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-02-12
Junio C Ha
m
ano
M
e
rge git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio
C Hamano
Add disc
u
s
s
ion
s
ection
to
gi
t
-tag
d
o
cument
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Ha
m
a
n
o
Teach git-am to
p
ass
-
p o
p
t
i
on down
t
o git
-
appl
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Juni
o
C
H
a
m
ano
D
o
c
u
mentation: git-rebase
-C<n>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-12
Junio C Hama
n
o
Me
r
g
e
b
r
anch 'master' of
git:
/
/repo
.
or
.
cz/git/fa
s
timport
commit
|
commitdiff
|
tree
2007-02-11
Junio
C
Hamano
t4016: test quoting fun
n
y path
n
a
m
es in
diff ou
t
p
u
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C
Ham
a
no
diff_fl
u
sh_
n
ame()
:
take struct diff_o
p
tions p
a
rameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-10
Junio C Hamano
wt_stat
u
s_prepar
e
()
:
clean up
s
t
ructure
i
nitializati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next