repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation/git.txt: update links to release notes
2009-05-25
Charles Bai
l
ey
Change xdl_mer
g
e to ge
n
erate output even
f
or null
merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
t60
2
3
:
merge-file fails to output anything
f
o
r
a dege
n
erate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Bai
l
ey
me
r
getool
:
fix
r
unning
merge
t
oo
l
in s
u
b-dire
c
to
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Char
l
e
s Bai
l
ey
mergetool
:
Add a t
e
st for
r
unning mergetool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
B
ailey
mergetool
:
re
s
pect autocrl
f
by using checkout-ind
e
x
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles
B
ailey
mergetool: Don't kee
p
temporary
m
e
r
ge files unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
har
l
es Baile
y
m
ergetool: Add promp
t
to continue after fa
i
ling to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
Add -y/
-
-
n
o-prom
p
t opt
i
on
to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charle
s
Bailey
F
i
x some tab/space
i
ncon
s
istencies in g
i
t-m
e
rgetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Char
l
es
Ba
i
l
ey
g
i
t
-
archive: work in bare repo
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Ba
i
ley
Make git ar
c
hive
respect core
.
autocrl
f
w
h
e
n
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Ch
a
r
l
e
s Bailey
A
d
d
new test to
demonstrate git archive core
.
a
u
t
ocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bailey
merge-tool documentation: d
e
scribe custom comman
d
usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
git-m
e
rget
o
ol documentaiton: show tooln
a
mes i
n
typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
dd
a very ba
s
i
c test script
f
or
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charle
s
Bai
l
ey
Teach git
merg
e
tool to use cu
s
tom
commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Ch
a
nged a
n
in
t
ernal
variable of merg
e
tool t
o
sup
p
ort
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
iley
Tidy up git mergetool's backup file behavi
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fix t
h
e Makefile to cope with s
y
s
t
ems
lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
ailey
Remove
ol
d
gene
r
a
t
ed files f
r
om
.
gitignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Bail
e
y
Fi
x
git-instaweb
b
reakage on MacOS X due
t
o the
l
imited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles B
a
iley
Fix clone not to ignore depth when p
e
rforming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree