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
Git.pm: better error message
2010-04-18
Charles Bail
e
y
Doc
u
m
entat
i
o
n
:
Describe other
s
i
t
ua
t
i
ons where -z a
f
fects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
Chan
g
e xdl
_
merge
to gen
e
rate
output even for null merge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Ch
a
rles
Bailey
t602
3
: merg
e
-f
i
le fails to ou
t
put a
n
y
thing for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
C
h
ar
l
e
s
Bailey
mergetool: fix running merge
t
o
o
l
i
n sub-dire
c
to
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Ba
i
ley
mer
g
eto
o
l: Add a test for running m
e
rg
e
tool in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arles B
a
iley
merg
e
tool: res
p
ect autocrlf by
using che
c
kout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mer
g
e
t
ool: Don'
t
k
eep temp
o
ra
r
y merge files unl
e
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Cha
r
l
e
s Ba
i
ley
mergetool: Add
p
rompt to continu
e
after failing t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles
B
ailey
Add -y/--
n
o
-
prompt option to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Fix so
m
e
t
ab/space inconsistencies i
n
g
it-mer
g
e
t
o
ol
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Cha
r
les Bailey
g
it-archive: work i
n
bare re
p
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bailey
Ma
k
e git archive res
p
ect
c
o
re
.
aut
o
c
r
lf when crea
t
ing
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles Bailey
Add n
e
w
t
est
to dem
o
nstra
t
e git a
r
chive
c
or
e
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bailey
me
r
ge-tool do
c
umenta
t
i
on: describe custom command
u
s
age
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s
Bail
e
y
git-mergetool do
c
umentai
t
o
n: show toolnames
i
n
typew
r
i
t
er
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rl
e
s Bailey
Add
a
ver
y
basic test script for git
m
erge
t
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles B
a
ile
y
Teach gi
t
merg
e
tool to use c
u
stom commands defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
a
rles Bailey
Changed an in
t
ernal variable of mergeto
o
l
to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Ba
i
ley
Tidy up git me
r
get
o
ol's backup f
i
le be
h
a
v
iour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
a
i
ley
gitk: Fix the Makefile to cope wi
t
h s
y
st
e
ms lac
k
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
C
h
a
rle
s
Bailey
Remove old genera
t
ed files from
.
gitign
o
re
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles Baile
y
F
ix gi
t
-ins
t
aweb breakage on Ma
c
OS
X
due
t
o
t
he limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Cha
r
les Ba
i
ley
Fi
x
c
l
one n
o
t to ignore dep
t
h
when performing a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree