repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Revert "git-pull: refuse default merge without branch.*.merge"
2006-12-22
Junio C
Hamano
R
e
vert "git
-
pull: re
f
us
e
d
e
fau
l
t merge wi
t
h
o
u
t branch
.
.
.
commit
|
commitdiff
|
tree
2006-12-21
Junio C Hamano
Merge b
r
a
n
ch 'ew/svn-pm'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
d
iff d
o
cu
m
e
ntati
o
n: mostly talk about <commit>
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio C Hamano
Merge branch 'jc/lef
t
right'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
Merge b
r
anch 'j
c
/blame'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Ham
a
no
Merge branch 'jc/branch-r
e
m
ove-remote'
commit
|
commitdiff
|
tree
2006-12-20
Junio
C Hamano
Merge b
r
anch 'jc/clon
e
'
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
compa
t
/inet
_
ntop: do not use
u
_
i
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C
H
amano
git-add
:
er
r
o
r
out when give
n
no arg
u
ments
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
M
e
r
ge branch
'
maint'
commit
|
commitdiff
|
tree
2006-12-20
J
unio C
H
aman
o
GIT
1
.
4
.
4
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Junio C Hamano
simplify
i
nclusion of s
y
stem hea
d
er files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
Jun
i
o C Hamano
con
f
ig_rename_sect
i
on: f
i
x FILE* leak
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-20
J
u
nio
C
Hamano
fix
p
op
u
la
t
e-
f
ilesp
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert "Make left-right automatic
.
"
commit
|
commitdiff
|
tree
2006-12-19
J
u
nio C Ha
m
ano
Use preprocesso
r
c
o
nstants
for e
n
v
i
ronme
n
t variable
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Ham
a
no
Do
n
ot cr
e
ate $GIT_DIR/remotes
/
d
irector
y
anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
J
uni
o
C
Hamano
Me
r
g
e
branc
h
'jc/test-
c
lon
e
'
i
n
t
o jc/clone
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Revert "fix testsuite: mak
e
sur
e
they use
t
empla
t
es
.
.
.
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
blame: -b (blame
.
blan
k
boundary) and --root (bl
a
me
.
showroot)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hamano
Tea
c
h git-
b
ranch to dele
t
e tracki
n
g
bran
c
hes w
i
th
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Junio C Hama
n
o
fix testsuite: make sure they use te
m
plat
e
s freshl
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-19
Ju
n
i
o C Ham
a
no
r
e
r
e
re:
f
i
x
b
r
e
a
ka
g
e
o
f
re
s
olv
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
racy-git:
d
ocu
m
entat
i
on
u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C
Hama
n
o
show-ref: fix --exc
l
ude-existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
parse-remote::expand_r
e
f
s
_w
i
l
dca
r
d()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
show-ref: fix --ve
r
ify --ha
s
h=length
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hama
n
o
s
how-ref: fix
-
-quiet --verif
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Junio
C
H
amano
Merge branch 'jc/blame-bou
n
dary'
commit
|
commitdiff
|
tree
2006-12-18
Junio C H
a
mano
Merge branch '
j
c/reflog
'
(
early part)
commit
|
commitdiff
|
tree
2006-12-18
Junio C Ha
m
an
o
Me
r
ge branch 'js/
b
r
a
nch-
c
o
n
fig'
commit
|
commitdiff
|
tree
2006-12-18
Junio C Hamano
Merge branc
h
'jn
/
web' (early part)
commit
|
commitdiff
|
tree
2006-12-18
Jun
i
o C Hamano
avoid accessing _a
l
l
_ loose ref
s
i
n
git-show-ref
-
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-18
Ju
n
io C
H
amano
git-fetch: Avoi
d
reading packed refs over and
o
ver
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Jun
i
o C Hamano
Teach show-b
r
anch how to sho
w
ref-log data
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hama
n
o
M
a
ke lef
t
-right automatic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
J
unio C Hamano
Teach all of log f
a
mil
y
-
-left-right output
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Haman
o
rev-list --left-right
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
mark
u
p f
i
x
i
n svnimport documentat
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Ju
n
io C
H
a
mano
Fix mis-mark-up
in g
i
t-merge-fi
l
e
.
t
x
t doc
u
me
n
t
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Ha
m
a
no
F
i
x
ch
e
ck_fi
l
e_directory_conflict()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C Hamano
g
it-add: remov
e
conf
l
icting e
n
t
r
y when adding
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-17
Junio C
H
amano
update-in
d
ex: make D/F
c
onflic
t
error a
bit more
v
erbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio
C
Hamano
gi
t
-clone:
lose
t
he tra
d
itiona
l
'no-separate-remote
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C
H
a
ma
n
o
g
it-clone:
lose the artificial "fir
s
t"
fetch r
e
fsp
e
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
git-pull:
r
efus
e
default merge
wi
t
hout b
r
anch
.
*
.
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
J
u
n
io
C
Hamano
git-clone: use
w
i
l
dcard specification
f
or tra
c
king
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
mer
g
e:
give a bit pre
t
tier me
r
ge message
t
o
"merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-16
Junio C Hamano
Merge branch 'js/show'
commit
|
commitdiff
|
tree
2006-12-14
Junio
C
Hamano
git-re
s
et
[--mixed] <tre
e
>
[
--] <paths>
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C
H
aman
o
g
i
t-reset: mak
e
it wor
k
from wi
t
hi
n
a subdire
c
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
J
unio
C
Hamano
git-fetc
h
: ma
k
e it work fr
o
m within a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hamano
Merge
branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-14
Junio C Hama
n
o
Upd
a
te git-diff
docu
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-14
Junio C H
a
mano
Merge br
a
nch 'jc/diff--cached'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
gi
t
-sv
n
: al
l
ow both diff
.
color and color
.
diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
io C Hamano
config documentati
o
n: g
r
oup color items together
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Haman
o
git-blame: show
lines attributed to
b
oundary commits
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ham
a
n
o
Merge br
a
nch 'jc/read-tree
-
i
g
nore'
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Ha
m
ano
Merge
b
ranch 'ew/r
e
rere'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o C
Hama
n
o
M
e
rge
branch 'np/addcommit'
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o
C
Hamano
Merge branch 'lh/bra
n
ch
-
r
e
na
m
e'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'jc/commit-careful'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merg
e
branch 'ap/clon
e
-origin'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
ano
Merge b
r
anch
'
jc/nu
m
stat'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C H
a
m
ano
M
er
g
e branch
'rr/cv
s
exportcommi
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
H
amano
Merge bra
n
c
h
'ap/bra
n
ch'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
branch --color
:
change default color selection
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
M
erge branch 'js/merge'
commit
|
commitdiff
|
tree
2006-12-13
Junio C H
a
mano
send-pack:
t
ighte
n
check
s
for rem
o
te names
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o C Hama
n
o
g
it-push: acc
e
pt tag <tag> as a
d
verti
s
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
spurious
.
sp in manpages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C Hamano
git merge: reword f
a
ilure m
e
ssage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Hamano
R
evert "git-
d
if
f
: In
t
roduce
--index and de
p
recate
.
.
.
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
io C H
a
man
o
gi
t
-push: document removal
o
f
remote ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ha
m
a
no
Merge
b
r
anch '
m
aster' into j
s
/merge
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'mai
n
t'
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
Junio C Hamano
diff --n
u
mstat: s
h
ow binary with
'
-
'
to m
a
tch "apply
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
s
h
ortlog: fix segfault on emp
t
y authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
shortlog: remove
"[PATC
H
]" prefix fro
m
shortlog o
u
tput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
io C
H
amano
git-commit: allow
-
-only to lose what was staged
e
a
rlie
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-10
Ju
n
i
o
C
Hamano
D
ocu
m
entati
o
n/gi
t
-commit:
r
e
w
r
ite to
m
ake it more end
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Junio C H
a
mano
git-rer
e
re: add 'gc'
c
ommand
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C
Hamano
Fix
perl/ buil
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
u
nio
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
no
git-merge: fix "fix confu
s
ion
bet
w
een tag
a
nd branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C
Hamano
git
-
merge: squelc
h
ne
e
dless error messag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C
H
amano
M
e
rge
commit
|
commitdiff
|
tree
2006-12-06
Junio C
Haman
o
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-reset t
o
rem
o
ve "$GIT_DIR/
M
ERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Haman
o
r
e
ad
-
t
r
ee
:
d
o
cume
n
t
-
-
ex
c
lude-per-
d
i
r
ect
o
ry
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
L
o
osen
"
working
file will
b
e lost
"
chec
k
in Porcelain-ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
i
o C Ham
a
no
r
ead-tree: f
u
rther loo
s
en "working
file will be los
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C
H
a
mano
unpack-trees:
make
s
u
r
e
"df_conflict_ent
r
y
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
u
nio
C
Hama
n
o
recei
v
e-pack:
do not insist
o
n f
a
st-forwa
r
d outsi
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
unio C Hamano
merge-recursive: use x
d
l_merg
e
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next