repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
gitattributes documentation: clarify overriding
2007-04-08
Junio C Hamano
Prepare for
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C Haman
o
A ne
w
merge stragety 's
u
b
t
ree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o
C Hamano
git
-
push to
m
ultiple l
o
cations does not st
o
p at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push reports the URL after faili
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge
branc
h
'j
c
/inde
x
-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
erge
bra
n
ch 'fp
/
m
a
ke-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o C
H
a
m
a
no
Merge br
a
n
c
h 'cc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
m
a
n
o
Merge br
a
nch 'jc/c
h
e
cko
u
t' (e
a
rly
p
a
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ham
a
no
Documentation: t
i
ghten dependency for gi
t
.
{h
t
m
l,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
ano
git-bisect: a
l
low bise
c
t
i
ng with on
l
y one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C H
a
mano
t
6
030: add a bit more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
an
o
git-bisect:
mo
d
erni
z
at
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
ma
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
ama
n
o
R
ena
m
e
a
dd_file_to_
i
n
d
ex
(
) to add_file_to_cache
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Re
n
ame
s
tatic variable write_index to update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Ham
a
no
Rename
i
n
t
ernal
function
"add_file_to_cach
e
"
in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Hamano
P
r
opaga
t
e
cache e
r
r
or in
t
erna
l
to
refresh_cache()
v
ia
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Fix bogus e
r
ror message from
m
erge-re
c
ursive
e
rror
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
F
ix d
e
p
e
ndency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hama
n
o
RP
M
s
p
e
c
:
i
n
clude git-p4 in the li
s
t of all p
a
ckages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
ano
rerere
:
ma
k
e sorting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Fix
s
witching to a branch with D/F when
c
urrent branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix twowa
y
_
m
erge tha
t
passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o
C Hamano
Fix read-tree --prefix=d
i
r/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
H
amano
unpack-
t
rees: get rid
of
*
indpo
s
param
e
ter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_trees
.
c
: pass unp
a
ck_t
r
ees_opt
i
o
ns structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
a
dd_cache_entry():
remo
v
al of
f
i
l
e
foo
d
oes not
c
o
n
flic
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge
b
ranch 'jc/bisect
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
Merge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
g
e branch '
p
ost
1
.
5
.
1/blam
e
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
M
erge branch
'post
1
.
5
.
1/t
c
l
t
k
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
amano
Merge b
r
a
n
c
h
'
p
ost1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
Merge branch
'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-re
a
d-
t
ree -
-
index-ou
t
p
u
t=<f
i
le>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ha
m
ano
_GIT_IN
D
EX_OUTPUT:
allo
w
p
l
umbing to
o
u
t
put to a
n
alt
e
r
nativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
chec
k
out: allow detaching to
HEAD e
v
en when sw
i
tching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
Merg
e
1
.
5
.
0
.
7
i
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
rerere should not repeat the
earlier hu
n
ks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
a
mano
Hopefully f
i
nal
up
d
at
e
to th
e
draft
R
e
lease Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
H
ama
n
o
Optional Tck/Tk: ignore
g
enerat
e
d fi
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hamano
Do not
both
e
r d
o
c
u
me
n
ti
n
g fe
t
ch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C H
a
mano
Update draft
release
no
t
es for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
Merge
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Haman
o
Merge
branch 'master' of
g
it://repo
.
o
r
.
cz/gi
t
/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Ha
m
ano
Doc
u
mentation: unbreak user-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
GIT 1
.
5
.
1
-
rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Update main git
.
h
tml page
t
o point at 1
.
5
.
0
.
6 documentati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
M
e
rge branch 'main
t
' to sy
n
c
h
ronize with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Fix
"--pretty=format:" fo
r
pa
r
en
t
r
elated items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-comm
i
t: "read-tree -m HEAD" is not
t
he right wa
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hamano
sha1_file
.
c
(write_sha1_file): Dete
c
t
c
l
o
se failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hama
n
o
Document git-log --fir
s
t
-par
e
nt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C
Hamano
G
IT
1
.
5
.
1
-
rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C
H
a
m
ano
Merg
e
br
a
nch 'j
c
/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
u
n
io C Hamano
Update REA
D
ME to
po
i
nt at a
few k
e
y periodi
c
a
l
messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Hamano
Merge b
r
anc
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C Ham
a
no
M
e
r
g
e branch 'm
a
int' of gi
t
://linux-nfs
.
org
/
~
bfield
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Hamano
Me
r
ge branch
'js/
r
e
mote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C H
a
mano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
m
a
n
o
git
-
a
m document
a
t
i
o
n: descr
i
b
e
what is
t
a
k
e
n
f
r
o
m where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
am
a
no
make the
p
revious optimization wor
k
also on pat
h
-
limit
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
rev-list --bisect: Fix
"halfway"
o
ptimization
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C Haman
o
Merge br
a
n
c
h 'master' into jc/bise
c
t
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
i
o
C
Hamano
Fix
pat
h
-
l
imit
e
d
"
rev-list --bisect" termina
t
ion condition
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-bis
e
c
t
.
s
h
: proper
l
y dq $GIT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
Hamano
git-
b
isect: typofix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C Hamano
chec
k
o
ut
:
report where the
n
ew H
E
A
D
i
s upon deta
c
hing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
J
unio
C H
a
mano
t
6004: add a bit more path op
t
imiza
t
i
on
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
Hamano
git
-
a
p
ply: Do not free
the wrong buffer w
h
en
w
e
co
n
vert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
Merge git://git2
.
kernel
.
org/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
M
erge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Hamano
git-rebase: make 'rebase HEAD branch'
work as
expec
t
ed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
git-rev
-
list --bisect: optimiza
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
git-rev-list: ad
d
--bisect-vars option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o
C Hamano
t60
0
2: minor spelling
f
i
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hama
n
o
tree_ent
r
y_interesting():
a
llow it
t
o
s
ay "
e
v
e
rything
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
tree
-
diff:
avoid
s
trncmp
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
H
aman
o
T
each tree_e
n
try
_
int
e
r
e
st
i
ng() that the t
r
e
e entries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
b
l
a
me: cmp_suspect is
not "cmp"
a
ny
m
ore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-20
Junio C H
a
mano
M
e
rge git://g
i
t2
.
kernel
.
org/pub
/
scm
/
g
itk/git
k
commit
|
commitdiff
|
tree
2007-03-20
Junio C Haman
o
blame: micro-optimi
z
e cmp_suspec
t
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Junio C
Ha
m
a
n
o
GIT 1
.
5
.
1-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o C Haman
o
Fix merge-index
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
J
u
nio
C Hamano
Merge branch
'
jb/gc
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
Merge branch 'fl/
c
vsserver
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
Merge b
r
anch 'sp/
r
un-command'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
Update main
g
it
.
html p
a
ge to
point at 1
.
5
.
0
.
5
documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-18
Junio
C Hamano
Merge
branch 'ar/diff'
commit
|
commitdiff
|
tree
2007-03-18
Junio C
H
am
a
no
Merge
1
.
5
.
0
.
5
i
n
f
r
om 'maint'
commit
|
commitdiff
|
tree
2007-03-18
J
u
nio C
Hama
n
o
GIT 1
.
5
.
0
.
5
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-17
Junio C
Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-17
Junio C
H
a
mano
app
l
ymbox: bro
w
n
paper bag fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
git-
l
og
-
-fir
s
t-p
a
ren
t
: s
h
ow only the first parent log
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Hamano
try-to-sim
p
l
i
f
y-commit: use diff-tree --qui
e
t machinery
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ha
m
ano
r
ev
i
sion
.
c
:
expla
i
n what tree_di
f
ference
d
oes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next