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
Merge branch 'jc/blame'
2006-12-20
Ju
n
io C Hamano
Me
r
ge branch 'jc/blame'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
aman
o
Me
r
g
e branch 'jc/bran
c
h
-remove-re
m
ote'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Ha
m
a
n
o
Merg
e
bra
n
ch
'jc/clone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
Hamano
compat
/
inet_ntop: do
not u
s
e u_int
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
git-
a
dd: error out
w
hen give
n
no arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
ni
o
C Haman
o
Me
r
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o
C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
simplify inclusion of sy
s
tem header fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
ni
o
C Hama
n
o
config_renam
e
_sec
t
ion: fi
x
FIL
E
* l
e
a
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Hama
n
o
fix populate-fil
e
spe
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
Us
e
preprocessor cons
t
ants for
e
n
vi
r
onment variable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Ha
m
a
no
Do n
o
t cre
a
t
e $GIT_DIR/re
m
otes/
d
irecto
r
y an
y
m
ore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Merge branch 'jc/t
e
st-clone'
i
n
t
o jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
Revert "fix testsuit
e
: make sur
e
they use
t
e
m
p
lates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio
C
Hamano
blam
e
: -b (b
l
ame
.
blankbounda
r
y
)
a
nd --root (blame
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C
H
amano
Teach git-branch to
delete
t
racking branch
e
s
wit
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ham
a
no
f
ix tests
u
ite: make sure
t
h
ey u
s
e templat
e
s fresh
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
u
ni
o
C Hamano
r
erere: fix breakage of resolving
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
a
mano
racy-git: document
a
tion
u
pdates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-ref
:
fix --ex
c
lud
e
-exis
t
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
pars
e
-remo
t
e::expand_refs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Haman
o
show-r
e
f:
f
ix --verify
-
-ha
s
h=le
n
gth
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C Ha
m
ano
show
-
ref: fix
-
-quiet
-
-verify
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Juni
o
C
Hamano
Merge b
r
anch
'jc/blame-boundary'
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
Hamano
M
e
rge br
a
nch
'
jc/ref
l
og
'
(early par
t
)
commit
|
commitdiff
|
tree
2006-12-18
J
u
n
io C Hamano
M
e
rge branch 'js
/
branch-config'
commit
|
commitdiff
|
tree
2006-12-18
Junio C
Hamano
Merge branch 'jn/w
e
b' (early
par
t
)
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
i
o C H
a
mano
avoid access
i
ng _a
l
l
_
loose
r
efs in
g
it-show-ref -
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git-f
e
tch: Avoid read
i
ng packed
r
efs over and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
ama
n
o
Te
a
ch show-branch how t
o
s
h
ow re
f
-
l
og da
t
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C Ham
a
no
markup fix
i
n svnimport documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Juni
o
C
Hamano
Fix
mis-mark-up
i
n
g
it-
m
erge-file
.
txt documenta
t
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C
Hamano
Fix check_file_dire
c
tor
y
_confl
i
ct()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
n
i
o C Haman
o
g
i
t
-
a
dd: remove confl
i
cting entry
w
h
en adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio
C Hamano
update
-
i
nde
x
: make
D
/
F
con
f
li
c
t error a bit more verbos
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
amano
git-clone: lose th
e
tradi
t
ional 'no-s
e
parate-remot
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
mano
git-cl
o
n
e
:
lose the arti
f
icial "f
i
rst" fetch refspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
m
a
n
o
git-pull: refuse
d
efaul
t
merge
without branch
.
*
.
merg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
mano
git-clone: use wildcard specification for tracking
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
Ha
m
ano
mer
g
e: give
a
bit p
r
etti
e
r me
r
ge me
s
sage to
"
mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merg
e
b
ranch 'j
s
/sho
w
'
commit
|
commitdiff
|
tree
2006-12-14
Juni
o
C
Hamano
git-reset [--mixed] <tree
>
[--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Ju
n
io C Hamano
git-r
e
set: make it w
o
rk from within
a
subdir
e
ctory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-fetch: make it
w
ork fro
m
within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
Upd
a
te
g
it
-
diff docume
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Mer
g
e branch
'
j
c/dif
f
--cached'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Hamano
git-s
v
n:
a
llow b
o
t
h diff
.
color and colo
r
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Haman
o
config documentation:
group color
items togeth
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Ha
m
ano
git-blame: show lines attributed to bounda
r
y
commit
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge br
a
nch 'jc/re
a
d-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Me
r
ge branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merg
e
bran
c
h '
n
p/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'lh/b
r
anch-rename
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Haman
o
Merge branch 'jc/co
m
mit-careful
'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o
C Hamano
Merge
branch 'ap/
c
lone-origin'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Ham
a
no
Me
r
ge bra
n
ch 'jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Merge branch 'rr/
c
vsexport
c
ommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merge branch 'ap/bra
n
ch
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
branch --
c
olor: ch
a
n
ge de
f
a
u
lt co
l
or
s
election
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
rge bran
c
h 'js/mer
g
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
send-pack: tig
h
ten
checks for remo
t
e na
m
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
g
i
t-push: accept tag <tag> as a
d
vertis
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
sp
u
rio
u
s
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Haman
o
git merge:
rewor
d
fai
l
ure m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Rever
t
"git-dif
f
: Introduce --
i
ndex and dep
r
eca
t
e
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
M
e
rge
br
a
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C Haman
o
git-push: document removal of remote ref wi
t
h
:<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio
C Haman
o
Merge
branch 'master' into js/
m
erge
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C
Hamano
add test case for
r
ecursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Hamano
d
iff -
-
numstat: show binary w
i
t
h
'-' to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C Hama
n
o
shortlog: fix
s
egfault on emp
t
y
a
uth
o
rname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
sho
r
tlog: r
e
move
"[P
A
TCH]" pre
f
ix f
r
o
m shortlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
Hamano
M
e
rge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2006-12-10
J
unio C H
a
mano
gi
t
-
c
o
mmi
t
: allow --only to lose
what w
a
s
s
taged
earlier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Haman
o
Docum
e
ntatio
n
/git-comm
i
t: rewrit
e
to ma
k
e it
more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
u
nio
C Hamano
git-rerere: add
'
gc'
c
o
m
mand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C
H
ama
n
o
Fix perl/ b
u
ild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio
C Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
J
unio C Hamano
gi
t
-merge: fix "fi
x
co
n
f
u
sion b
e
tween
t
ag an
d
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
gi
t
-me
r
g
e
: squelch needless error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C
H
a
m
ano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C
H
a
ma
n
o
M
e
rge b
r
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-reset to remove "$GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
read-tree: document --exclude-per-directo
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hama
n
o
Lo
o
sen "work
i
ng file will b
e
lost"
check in Porcelain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio
C
H
amano
read-tree: fur
t
h
er loosen
"
working file w
i
ll be los
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Ha
m
ano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hama
n
o
unpac
k
-trees
:
make s
u
re "df_confli
c
t_e
n
t
r
y
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C H
a
mano
re
c
eive-pack: do no
t
insist on
fast
-
forw
a
rd
o
u
tsi
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C
H
amano
merge-r
e
cu
r
sive: u
s
e xdl_merge(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
x
merg
e
:
make return va
l
u
e
from xdl_merge() more usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
uni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Hama
n
o
git-merge
:
fix confus
i
on
be
t
w
ee
n
tag and bran
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
u
n
io C Hamano
M
erg
e
master
.
kernel
.
org:/
p
ub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
m
ano
Merge bra
n
c
h
'
m
aint'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
i
o C Hamano
tutorial: talk about user
.
name
e
arly and don
'
t
start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
Hamano
Merge branch 'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
J
unio C Hamano
Merge
branc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
next