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
Simplify code to find recursive merge driver.
2007-04-19
Juni
o
C
Hamano
S
i
m
p
l
ify code
to find recursive merge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fi
x
i
n merge-r
e
cur
s
ive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hama
n
o
Fix
funny t
y
pes used in attribute value repres
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
l
ow-leve
l
driver to specify different behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Hamano
Custom low-level merge
driver:
c
hange the co
n
figuratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
A
l
l
ow the
d
efault lo
w
-level merge dri
v
er to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Custom lo
w
-lev
e
l me
r
g
e
driver
support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C
H
amano
Add a de
m
onstration/test of customiz
e
d
m
er
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Allow specifyin
g
specialized merge-back
e
n
d per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge
-
r
ecursive: separate out x
d
l
_
merge
(
) interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C H
a
m
a
no
Al
l
ow more t
h
an true/fal
s
e
to
attrib
u
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
H
amano
Change attribute negatio
n
marke
r
from '!' to
'
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defin
e
a built-in attribute m
a
c
r
o
"binar
y
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
attr
i
bu
t
e macro
s
upport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hama
n
o
Makefile: add pa
t
ch-ids
.
h
back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attrib
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Fix 'crlf'
a
t
tribut
e
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Tea
c
h 'diff'
a
bou
t
'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hamano
Define 'crlf' at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Add basic inf
r
as
t
ructure to as
s
ign attributes to
p
at
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hama
n
o
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hama
n
o
Do
n
ot defa
u
l
t to --no-index when give
n
t
w
o directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Hamano
M
e
rg
e
bran
c
h
'
j
c
/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
F
ix
g
it {log,show,
.
.
.
} --p
r
etty
=
e
m
ail
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Documenta
t
ion: --cherr
y
-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
g
i
t-log --
c
herry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
Ref
a
ctor patch-
i
d filt
e
ring out of git
-
cherry and
gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
A
dd %
m
to
'
--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Me
r
ge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hama
n
o
fsck: do not c
o
mplain o
n
deta
c
hed
H
E
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
Me
r
ge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge
b
ranch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C
H
amano
Merge br
a
n
ch 'j
c
/merge-subtre
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
M
erge branch 'js
/
fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Add Doc
u
m
e
nta
t
io
n
/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Ha
m
ano
Start 1
.
5
.
2 c
y
cle by
prepareing Rel
N
ote
s
for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
n
o
Merge
bran
c
h
'
j
c
/read-tree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C H
a
mano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
P
rep
a
re for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
A new me
r
ge
stragety
'
subtr
e
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
ano
git-push t
o
multip
l
e location
s
does
n
o
t
stop at th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push
r
eports the UR
L
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Me
r
ge
branch 'jc/i
n
dex-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Ha
m
a
no
M
erge branch 'fp/m
a
ke
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branc
h
'
c
c/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/che
c
kout' (
e
arly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge branch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
ma
n
o
D
o
cumenta
t
ion
:
ti
g
hten de
p
endenc
y
f
o
r git
.
{
htm
l
,
t
x
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
g
i
t-bis
e
ct:
allow
b
i
s
ecting with only one bad
commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
t
6
0
3
0: add
a bit more
t
e
sts to git
-
bise
c
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io C
Ham
a
no
g
it-bisect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Haman
o
Rename add_
f
i
le_to_in
d
ex() to
a
dd_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o C
H
a
m
ano
R
ename static vari
a
b
l
e write_index to update_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e internal function
"ad
d
_file_to_cach
e
" in builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
Hama
n
o
P
r
opagate
cache err
o
r int
e
r
n
al to refresh_c
a
che() v
i
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bogus error mess
a
ge from merge-re
c
ursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
uni
o
C Hamano
Fix dependency
o
f
c
ommon-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: inclu
d
e
g
it-
p
4 in the lis
t
o
f
a
ll packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C
Hamano
rerere: make sorting re
a
lly
sta
b
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix sw
i
t
c
hing
t
o a
bra
n
c
h wit
h
D
/F when c
u
r
r
en
t
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix twoway_m
e
r
g
e that passe
d
d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-t
r
ee --prefix=dir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C
Ha
m
ano
unpack-trees: get
r
id of *indpos pa
r
ameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
u
np
a
ck_trees
.
c: p
a
ss unpack_
t
rees
_
options st
r
uc
t
ure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
add
_
cache_ent
r
y()
:
removal
o
f fi
l
e foo does not conflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merge br
a
nch 'j
c
/bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o
C
H
a
m
ano
Me
r
g
e branch '
f
l
/
doc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
mano
Merge b
r
a
n
c
h
'
p
ost1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post1
.
5
.
1
/
tcl
t
k'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Ha
m
ano
M
e
r
ge bra
n
ch
'
post1
.
5
.
1
/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
a
mano
M
e
rge bran
c
h 'lt/dirwalk
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
ano
git-read-tree
-
-index-output=<f
i
le>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_
GIT_I
N
DEX_OUTPUT
:
allow
p
lumbing to output to an altern
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
check
o
ut: all
o
w detach
i
ng to HEAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ham
a
no
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
a
no
Merge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
ano
re
r
e
r
e should not
r
ep
e
at the earlier hunks
in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopef
u
ll
y
final upda
t
e to the draft Relea
s
e
N
o
tes
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ha
m
ano
Opt
i
onal Tck/Tk: ignore generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Ham
a
no
D
o
not bot
h
er docu
m
enting fetch--
t
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
U
pdate d
r
aft release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Merge b
r
a
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Merge
bra
n
ch 'master
'
of
g
it://repo
.
or
.
cz/git
/
me
r
getool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
a
man
o
Documentation
:
un
b
reak user-
m
an
u
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Upd
a
te
ma
i
n git
.
html page to po
i
nt at 1
.
5
.
0
.
6
documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o
C H
a
ma
n
o
Merge branc
h
'maint' to synchroniz
e
w
i
t
h 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
F
i
x "
-
-pretty=fo
r
m
a
t
:" for paren
t
re
l
a
ted 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" i
s
not the
r
ight
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C Hamano
sha1_file
.
c
(
w
r
i
te_
s
ha1_file): Detect
c
l
ose failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
uni
o
C Ham
a
no
Do
c
ument
g
it-lo
g
--first
-
par
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-
r
c2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
a
n
o
M
e
rge branch 'jc/fp
l
'
commit
|
commitdiff
|
tree
2007-03-26
J
unio C Hamano
U
pdate REA
D
ME to point at a fe
w
key
periodical
m
essage
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next