repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'sc/http-late-auth'
2010-04-18
Charles Bailey
D
ocumentation: D
e
scribe other si
t
u
a
tions wh
e
re
-
z aff
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
es Ba
i
l
ey
Change
xdl_merge to ge
n
erate output
e
ven
for null merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
har
l
es Bailey
t
6
023: me
r
ge-fi
l
e
fail
s
to output
a
nything
f
or a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
harles Bailey
mergetoo
l
: fix
r
unning me
r
getool
i
n s
u
b-d
i
rectories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
B
a
iley
m
e
r
getool: Add a t
e
st for running me
r
g
etool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles Bai
l
ey
mergetool: respe
c
t
autocrlf
by using checkout
-
index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles B
a
iley
mergetool: Don't keep temporary
merge
fi
l
es unless
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charl
e
s Bailey
mergeto
o
l:
Add
prompt t
o
co
n
tinu
e
a
ft
e
r failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles
B
aile
y
Add -y/--
n
o-p
r
ompt option to merge
t
ool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fix some tab/space inconsi
s
tencies in git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bail
e
y
git-archiv
e
: work in
b
ar
e
repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bail
e
y
M
ake git archiv
e
r
e
s
pect c
o
re
.
au
t
ocrlf
when cre
a
ti
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charl
e
s B
a
iley
Ad
d
new t
e
st to demon
s
trate gi
t
archive
core
.
aut
o
crlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Ba
i
ley
m
e
rge-tool doc
u
m
e
ntation: de
s
cribe custom command
u
sage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
B
a
i
l
ey
git-
m
ergetool documentaiton:
s
ho
w
toolnames in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Add a very basic test script
for g
i
t
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rles Bailey
Teach git mer
g
etool
t
o use cust
o
m commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed
a
n intern
a
l v
a
riable
o
f merget
o
ol
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
T
i
dy u
p
g
it mergetool
'
s bac
k
up file
b
e
h
a
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Char
l
es
Bailey
gitk
:
Fix the Make
f
ile to cope with syste
m
s lac
k
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Char
l
es
B
ailey
Remove
o
ld
generated files fr
o
m
.
gitigno
r
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Bailey
Fix g
i
t-instaweb breakage
o
n MacO
S
X due to t
h
e li
m
i
ted
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
C
h
arle
s
Bailey
F
i
x
c
lone no
t
to ignore depth when performi
n
g a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree