repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Custom low-level merge driver: change the configuration scheme.
2007-04-18
Junio C Hamano
Custom low-level
m
erge driver: change th
e
configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
All
o
w the default
lo
w
-level merge drive
r
to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low-level mer
g
e
driver su
p
por
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add
a demonstration/test of custom
i
zed merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
Allo
w
s
p
e
c
ifying specialized
merge-back
e
nd per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
am
a
no
mer
g
e-recursive: se
p
arate out xdl_merge() interf
a
ce
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C Hamano
Allow more t
h
an
t
rue/false to at
t
r
i
b
u
te
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Chang
e
a
ttribute negation marke
r
f
r
o
m
'
!' t
o
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
De
f
ine
a built
-
in attribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
at
t
ribut
e
m
acr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Ham
a
no
Makefil
e
: add patch-ids
.
h ba
c
k in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Fix 'd
i
ff' attribute seman
t
ics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
i
x 'crlf' attribute
s
emantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C
Hamano
Teach
'
diff'
a
bou
t
'diff' attr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C
H
a
m
a
no
Define 'crlf'
a
ttribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add
b
asic infra
s
tructure to assign att
r
ibutes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Ham
a
no
Do not d
e
fault to --
n
o-i
n
dex
w
h
en gi
v
e
n
two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Mer
g
e
b
r
anc
h
'jc/
c
herry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
i
o
C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
Hamano
Fi
x
git {log,show,
.
.
.
} --
p
r
et
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
ocum
e
ntat
i
o
n: --cherry
-
pic
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
a
mano
Refacto
r
patch
-
i
d
filtering out of gi
t
-
c
herry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Add %m
to
'
--pretty=f
o
rmat:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Ham
a
n
o
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Ju
n
io C Hamano
fsck:
do not complain on detached HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o
C Haman
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Ham
a
no
Me
r
ge
branch
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge
b
r
a
nch
'
jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
r
ge
branc
h
'
js/fetch
-
p
r
o
g
ress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o C Hamano
Add Documentation/cmd-list
.
made to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
uni
o
C
H
amano
S
tart 1
.
5
.
2 cycle by prepareing RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Mer
g
e branch 'jc/r
e
ad-tree-df
'
(ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Me
r
ge
b
r
anc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o
C Hamano
Prepare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new mer
g
e stragety 's
u
b
tree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to
mu
l
tiple l
o
cations
does not stop at
th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-push reports the UR
L
a
f
ter failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branch 'jc/
i
ndex-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
e
rge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hama
n
o
Merge
b
r
anch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C H
a
mano
M
e
rge
bra
n
ch '
j
c
/checkout'
(
early
par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Documentation:
tig
h
t
en dependenc
y
for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Hamano
git
-
bisec
t
: al
l
o
w
b
i
sec
t
in
g
with only on
e
bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
t6030:
add a bit
m
ore tes
t
s to
git-b
i
sect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C Hamano
g
i
t-bisec
t
: modernization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename add_file_to_i
n
de
x
() to add_file_to_
c
ache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static v
a
riable
w
rite_
i
n
dex
t
o update_
i
n
d
ex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rename intern
a
l function
"
add_file_to_cach
e
"
i
n builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate cache error int
e
rn
a
l to ref
r
e
s
h
_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Haman
o
Fix bogus error me
s
sage
f
r
om merge-recursive
e
rror
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix de
p
endency of com
m
o
n
-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
R
P
M spec: i
n
clu
d
e git-p4 i
n
the list of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerer
e
: m
a
k
e sortin
g
reall
y
stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
F
i
x
s
wi
t
ching t
o
a branch wit
h
D/F when
c
urrent b
r
anc
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
Fix twoway_mer
g
e th
a
t passed d/f
c
o
n
flict marker t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ham
a
n
o
Fix re
a
d-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpac
k
-trees: get rid
of
*indpos para
m
eter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
u
n
pa
c
k_tr
e
es
.
c
:
pas
s
unpack
_
t
r
ees_optio
n
s structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_c
a
c
he_entry(
)
: remova
l
of file
foo d
o
es not conf
l
ict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge branch 'jc
/
bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge branch 'fl/
d
oc'
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C Hamano
Merge b
r
anch 'post1
.
5
.
1/b
l
a
me
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
man
o
Merge branch 'post1
.
5
.
1/p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
a
m
ano
M
e
rge branc
h
'
lt
/
dirwa
l
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
a
no
git
-
r
ead-tree --i
n
dex-
o
u
tpu
t
=
<fi
l
e
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
_GIT_INDEX_OUTPUT: allo
w
plumb
i
ng
to output to an
a
lternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
checkout: allow detachi
n
g
t
o HEAD even when switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merg
e
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C H
a
m
ano
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ham
a
no
rerere should not rep
e
at t
h
e earl
i
e
r
h
unks in
la
t
e
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio
C
H
a
ma
n
o
Hop
e
fully final upda
t
e
t
o the draft R
e
le
a
se Not
e
s
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Juni
o
C Ha
m
ano
O
p
t
iona
l
Tck/Tk: ignore generat
e
d files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do not b
o
ther doc
u
m
enting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
Update draft releas
e
notes
f
o
r 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Haman
o
M
erge branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge
b
ran
c
h 'master'
o
f
git://repo
.
or
.
cz/git
/
me
r
getool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C
Hamano
Documentation: unbreak user-manu
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Updat
e
main g
i
t
.
html
page to
p
o
int
a
t
1
.
5
.
0
.
6 documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
am
a
no
Merge branch 'mai
n
t' to s
y
n
c
hronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix
"
--pretty=format:" for par
e
nt relate
d
items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C
Hamano
git-comm
i
t: "read-tree -m H
E
AD
"
is not th
e
r
i
ght way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
s
h
a1_file
.
c
(
wr
i
te_sha1_file): Detect close failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C Hama
n
o
Documen
t
gi
t
-
log --first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hama
n
o
G
IT 1
.
5
.
1-r
c
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
Merge br
a
nch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
a
mano
Update README to point at a few k
e
y periodical me
s
sage
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merg
e
branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch
'maint' of git://linux-nfs
.
org/~bfie
l
ds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge br
a
nch 'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
Hamano
Merge bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
next