repo.or.cz
/
git
/
trast.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
Junio C
Hamano
Merg
e
b
ranch 'jc/
b
l
a
me'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
M
e
r
g
e branch 'jc
/
branch-remove-remote'
commit
|
commitdiff
|
tree
2006-12-20
Juni
o
C Hamano
Merge bran
c
h 'jc
/
c
lone'
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
a
m
ano
co
m
pat/ine
t
_ntop: do n
o
t
use
u_in
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Hamano
git-add: e
r
ror out
when g
i
ven
n
o
arguments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Ha
m
ano
Merge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
GIT 1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Ju
n
io C Ham
a
no
simpl
i
fy inclusion of
syst
e
m header files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio
C
Hamano
config_rename_section: fix FILE* lea
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
unio C H
a
mano
fix popu
l
ate-filesp
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Us
e
preproce
s
sor
c
onstants fo
r
e
nvironm
e
nt varia
b
le
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ha
m
ano
Do
n
ot create $G
I
T_DIR
/
remotes/ dir
e
ctory
anymor
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Merge branch 'jc/test-clon
e
'
i
n
to jc
/
cl
o
ne
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
Revert "fix tests
u
ite: make
sure they use tem
p
lates
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C
Hamano
blame: -b (blame
.
blankboundary) and --root
(blame
.
s
howroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
unio C Ham
a
no
Teach git
-
b
ranch to de
l
ete tra
c
k
i
n
g
branc
h
es with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C H
a
mano
f
i
x t
e
s
t
suite:
m
ake
sure they use templates fresh
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Juni
o
C Hamano
re
r
e
r
e: fix breakage of resolvi
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
ano
racy-git:
d
ocumentation
u
pdat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
amano
show-ref: fix --exclude-ex
i
stin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C H
a
mano
parse-r
e
mo
t
e::expand_refs_wildcard()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
sho
w
-r
e
f: fix --v
e
rify --hash=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hama
n
o
show-ref
:
fix --quiet -
-
v
er
i
f
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge branch 'jc
/
bl
a
me-b
o
undary'
commit
|
commitdiff
|
tree
2006-12-18
J
unio C
H
a
m
ano
Merge
branch
'
j
c
/reflog'
(
e
arly part)
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o
C Hamano
Merge bra
n
ch 'j
s
/
bra
n
ch-c
o
nfig'
commit
|
commitdiff
|
tree
2006-12-18
Junio C
H
amano
Merge bran
c
h 'jn/web' (earl
y
par
t
)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
a
v
oi
d
ac
c
e
s
s
in
g
_all_
l
oose refs
i
n git-show-ref
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
git
-
fet
c
h
: Avoid re
a
ding packed refs over and over
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
Te
a
ch sho
w
-branch h
o
w t
o
sh
o
w ref-log da
t
a
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
markup f
i
x in svnimport
docum
e
ntatio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ham
a
no
F
ix mis-
m
ark-up in git-mer
g
e-file
.
txt
document
a
tio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ham
a
no
Fix check_file_
d
irectory_co
n
f
lict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
ano
git-add
:
remove conflicting
entry
when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
u
n
io
C Hamano
update-index:
make D/F conflict error a bit more ver
b
ose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C Hamano
git-clone
:
lose
t
he
t
raditional 'no-separ
a
te-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
unio
C Hamano
g
it-clone:
l
os
e
the
artificial "f
i
rst
"
fe
t
ch
r
efspec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Ha
m
ano
g
i
t-pull: refuse default merge w
i
tho
u
t branch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C H
a
mano
gi
t
-clone:
u
se wildcard
s
pec
i
fication
for tr
a
c
k
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Ju
n
io C
Ha
m
a
no
merge: give a
b
it prettier merge
m
essage to "
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
amano
M
erge
branch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
git-
r
eset
[
--mixed] <
t
ree> [--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Jun
i
o C Ham
a
no
git-reset: make i
t
work from within a su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
git-fe
t
c
h
:
m
ake it wor
k
from within a
s
ub
d
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
Ha
m
ano
M
e
rg
e
branch 'maint
'
commit
|
commitdiff
|
tree
2006-12-14
J
u
nio C Ham
a
no
Upda
t
e g
i
t
-
diff documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
unio C
Hamano
Me
r
ge
b
ranch 'jc/diff-
-
c
a
che
d
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
g
i
t-svn: allow b
o
th d
i
ff
.
col
o
r
a
nd
c
o
lor
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
un
i
o
C Hamano
con
f
ig do
c
ument
a
tion
:
group colo
r
i
t
ems
together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
git-blame:
s
how lines attributed
to boun
d
ary commi
t
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Haman
o
Merge b
r
anch 'jc/read-tree-ignore'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
Merge branch 'ew/rerere'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'np/
a
ddcommit'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Merge branch 'lh/branch-
r
ename'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C
H
amano
Merge branch 'j
c
/
c
ommit-caref
u
l
'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C
Ham
a
no
Merge branch 'ap/clone
-
origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge
b
r
a
nc
h
'
jc/numstat'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hama
n
o
Merge
bra
n
c
h
'rr/cvs
e
xportcom
m
it'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
e
rge branch 'ap/
b
ranch'
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio C Hamano
branch -
-
co
l
or
:
change default color selection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
Me
r
ge br
a
n
c
h
'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C
H
amano
send
-
p
ack: tighten
checks for r
e
m
o
te n
a
mes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
git-
p
ush: a
c
c
ept tag
<
t
ag> a
s
advertised
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
un
i
o C
Hamano
s
p
ur
i
ous
.
s
p i
n
m
a
npages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C H
a
mano
git merge: reword failure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
Revert "git-di
f
f:
I
ntroduce --i
n
dex and deprecate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hamano
git-
p
ush
:
d
o
c
u
ment removal of remote ref wit
h
:
<
dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io
C
Haman
o
M
e
rge
branc
h
'master
'
into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Mer
g
e branch
'
m
aint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
a
dd te
s
t case
fo
r
recu
r
sive me
r
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C Hamano
diff --n
u
mstat: show binary with '-' to match "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
s
hortlog: fix s
e
gfau
l
t
o
n
e
mpty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hama
n
o
shortlog:
r
emove "[PATCH]" prefix from sh
o
rtlog output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Junio
C
Hamano
git-commit:
allow --o
n
ly
t
o l
o
se w
h
at
was staged
e
ar
l
ier
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Junio C Hamano
Documentation/git-c
o
m
mit: r
e
write to make
i
t more e
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C Ham
a
no
git-rerere:
a
dd
'gc' comman
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Jun
i
o C Ha
m
a
no
Fix perl/ bu
i
ld
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C
Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C
Ha
m
ano
git
-
me
r
ge: fi
x
"fix
conf
u
s
ion between tag and bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
io C Hamano
git-m
e
rge: squelch needless error mess
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C H
a
mano
Merge
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
g
i
t-reset to
r
e
m
o
ve "$GIT_DIR
/
ME
R
GE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
ama
n
o
read-tree
:
document --exclude-per-directory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
no
Loosen "worki
n
g
file
w
i
l
l be
l
ost" check in Porc
e
lain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Hamano
r
e
a
d
-tree: furth
e
r
loo
s
en "working
f
ile
wil
l
be lost
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
u
nio C Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C
Ham
a
no
unpack-trees:
m
ake s
u
r
e
"df_
c
onflict_entry
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
re
c
eive-pa
c
k: do not insist on fast-for
w
ard
o
utside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio
C Hamano
m
e
rge-
r
e
c
ursive
:
use
x
d
l_me
r
ge()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
x
merge: make return value fro
m
xdl_merge() more u
s
ab
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
M
erge
b
r
anc
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2006-12-03
Jun
i
o C Ha
m
ano
git-merge: fix con
f
usion between
t
ag and branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
Merge master
.
k
e
rnel
.
org:/pub/
s
cm/
g
i
t
k/g
i
tk
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
i
o
C Hamano
Merge branc
h
'mai
n
t
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
tutor
i
al:
ta
l
k about user
.
na
m
e early and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
un
i
o C Hamano
Merge b
r
anch 'jc/
g
lobfetch'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C Hamano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
next