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
Add a demonstration/test of customized merge.
2007-04-17
J
unio C Hamano
A
dd
a
d
emon
s
tration/test of customized mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ham
a
n
o
Allow specifying spec
i
alized merge-
b
ack
e
n
d per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
Hamano
merge-recursive: separat
e
out
x
dl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow more th
a
n true/fals
e
to at
t
ributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
amano
Chan
g
e
a
ttribute negatio
n
mar
k
er from '!' t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C Ha
m
ano
Define a
b
uilt-i
n
attribute
m
acro "
b
inary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
at
t
r
ibute macro
suppor
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Ha
m
ano
Makefi
l
e: add patch-ids
.
h b
a
ck in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Fix 'diff' att
r
ibut
e
s
e
mantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Fi
x
'crlf' attri
b
ute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
T
e
a
c
h 'di
f
f' about
'diff' attri
b
ut
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hama
n
o
Define '
c
rlf' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Ham
a
no
Add basic infrastructure to assig
n
attr
i
b
u
tes to
p
aths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C
Hama
n
o
D
o
not default to --no-index when given tw
o
d
irectori
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Merge b
r
an
c
h 'jc/
c
herr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io
C Hamano
Merge branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
J
unio
C
Hamano
Fix
g
it {log,show,
.
.
.
}
--pre
t
t
y
=em
a
il
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation: --cherr
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
git-log --cherry-pi
c
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Refactor pa
t
ch-
i
d filter
i
ng out of g
i
t-c
h
erry and
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ham
a
no
Ad
d
%m t
o
'--pre
t
ty=forma
t
:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ham
a
no
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C
Haman
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
f
sck: do not
c
omplain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merg
e
branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
mano
Merge branch 'jc/me
r
g
e
-
s
ubtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hamano
Merge branch 'js/fetc
h
-progress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Ha
m
an
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Documentation/
c
m
d-list
.
mad
e
to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Start 1
.
5
.
2 cycle by prepareing Rel
N
otes for
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Merge branch 'jc/read-tree-df
'
(
e
arly part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Merge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Prep
a
re
f
o
r 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
n
ew merge stra
g
ety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o C H
a
mano
git-
p
ush to multiple locati
o
ns does not sto
p
at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-push report
s
the URL afte
r
failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge
branch
'jc/inde
x
-
o
u
tput'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge br
a
nch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge branch 'c
c
/b
i
sect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ha
m
ano
M
e
r
g
e
branch 'j
c
/checko
u
t
'
(early
p
art)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Documen
t
ation
:
tighten dep
e
ndency for
git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
git-
b
i
sect: allo
w
bi
s
e
cting
w
ith on
l
y one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030:
a
dd a bit more t
e
s
t
s to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C Hamano
git-bisect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Rename add_file_to_index() to ad
d
_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Rename static
v
a
riable
w
ri
t
e
_
index to up
d
a
t
e
_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
io C
H
a
m
ano
Rena
m
e internal function "add_file_to_cac
h
e" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Propagate cache error internal to refresh_cache()
v
ia
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Fi
x
bogus error
m
ess
a
ge from merge-rec
u
rsive e
r
r
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Fix dependency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
RPM spec: includ
e
git-p4
i
n the li
s
t of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hama
n
o
rerere:
m
a
ke sor
t
i
n
g really sta
b
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ha
m
a
no
F
ix
switching to
a
b
r
anch with
D/F w
h
en curr
e
nt branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Haman
o
Fix t
w
oway_merge that passed
d
/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix r
e
ad-
t
re
e
--p
r
efix=d
i
r/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Haman
o
unpa
c
k
-
trees:
g
et rid o
f
*indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_trees
.
c: pass unpack_trees
_
options struc
t
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
add
_
cache_entry(): removal
of file foo does
n
o
t
c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
rge branc
h
'jc/bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erge b
r
a
nch 'fl/
d
oc'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ham
a
no
Merge
b
ranch 'po
s
t1
.
5
.
1
/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hama
n
o
Merge
branch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge branch 'post1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge b
r
an
c
h
'l
t
/
dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
git-read-
t
ree --inde
x
-outp
u
t=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Ham
a
no
_GIT_I
N
DEX_OUTPUT: al
l
ow plumbing to output to an altern
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
c
h
e
cko
u
t: allow detaching to
H
EAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
GIT
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
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 sh
o
u
ld n
o
t re
p
eat the earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Jun
i
o C Ham
a
no
Hopefully final u
p
date
t
o
the draft
R
elease N
o
te
s
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
un
i
o C Haman
o
O
pt
i
onal Tck/Tk: ignore generate
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
D
o not bot
h
e
r documenti
n
g fetch-
-
tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
U
p
d
ate
d
raft releas
e
not
e
s for
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C H
a
man
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o
C
H
amano
Merge br
a
n
c
h
'
m
aster' of git://repo
.
or
.
cz/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
Document
a
tion: u
n
break user-man
u
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
an
o
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
Up
d
ate main g
i
t
.
html
page to point a
t
1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
M
e
r
ge
b
ranch 'maint' to s
y
nchronize w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hama
n
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Fix "--pretty=format:" for p
a
ren
t
r
elated item
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
git-commit: "read-tree
-m HEAD" is not th
e
right
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
H
ama
n
o
sha1_file
.
c (write_
s
ha1_file)
:
Dete
c
t
close
f
a
ilure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C Ha
m
ano
Document
g
it-l
o
g --
f
irs
t
-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
am
a
no
GIT 1
.
5
.
1
-
rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
aman
o
Merge br
a
nch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
Up
d
ate README t
o
point a
t
a few ke
y
p
e
riodical mes
s
age
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Hamano
Merge branch 'maint' of
g
it://linux
-
nf
s
.
o
r
g/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Haman
o
Merge bra
n
ch 'js/remote-sho
w
-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
H
a
m
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
i
o C Hamano
git-am documen
t
ation:
describe what is taken from where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
make the prev
i
ous optimization work also on p
a
th
-
limi
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C
Hamano
rev-list --
b
isect
:
Fix
"
halfway" opt
i
mi
z
ati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next