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
Git 2.0-rc0
2014-03-31
Charles Bail
e
y
tests:
d
on't re
l
y
o
n strerror
t
ext w
h
en testing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: ma
k
e git_fn
m
atch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
es Bailey
mergetool: Remove
e
xplicit referenc
e
s
to /d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Char
l
es Bailey
stash tests: stash c
a
n lose da
t
a in
a file remove
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles B
a
il
e
y
s
t
a
sh: Don't
o
v
erwrite files that hav
e
gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
arles B
a
iley
Documentation: Describe
o
t
h
er situations
w
h
ere -z aff
e
cts
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charle
s
Bailey
C
h
an
g
e xdl_merge
t
o gen
e
rate output even for null
m
erges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
h
arles
B
ailey
t6023: merge-fil
e
fai
l
s
to output anyt
h
i
n
g for a degenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Ch
a
r
l
es Bailey
m
e
rgetool: fix runn
i
ng mergetool
i
n
sub-direct
o
rie
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
m
e
rgetool
:
A
d
d a test for runni
n
g merget
o
ol in a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Charles
Bailey
mergetoo
l
: respect
a
u
t
ocrlf by
u
sing checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
ha
r
les Ba
i
l
e
y
m
erge
t
ool:
Don't ke
e
p temporary mer
g
e files unl
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles Bailey
me
r
getool: Add prompt to continue after
failing to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/--no-prompt option
t
o mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Fi
x
some
t
a
b/space inconsistencie
s
in git-mer
g
eto
o
l
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles Bailey
git
-
ar
c
hive:
w
o
r
k
in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es Bailey
Make
git archive respect core
.
a
utocrlf when crea
t
in
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bailey
Add
new
t
est to demo
n
st
r
ate git archiv
e
core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Cha
r
les Bai
l
ey
me
r
ge-tool documentation:
describe cu
s
tom c
o
mmand usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charl
e
s Bai
l
ey
git-merge
t
ool
d
o
cu
m
entaito
n
: show too
l
names in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
B
ailey
A
dd a ve
r
y
b
asic test s
c
ript
f
o
r
git m
e
rgetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s
Bail
e
y
Teach git
mergetool
t
o use custom c
o
mmands
d
e
f
i
ned
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
C
ha
n
g
e
d
an in
t
ernal varia
b
le of mergetool to sup
p
o
rt
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Tidy up gi
t
me
r
getool's backup file behaviour
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charle
s
Bailey
gitk: Fix the
M
a
k
efile to
c
ope w
i
th sys
t
ems lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rl
e
s Bai
l
ey
Remo
v
e
old
g
enera
t
ed files from
.
git
i
gnore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles B
a
iley
Fix git-in
s
t
awe
b
breakage on M
a
c
O
S X due to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
Fix clone not
to ignore depth when performing a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree