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
Merge branch 'jk/config-die-bad-number-noreturn'
2014-03-31
Charle
s
Bailey
tests:
don
'
t rely on s
t
rerror text when te
s
ting rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Char
l
es Bailey
d
i
r
.
c
: make git_fnma
t
ch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Char
l
es Bailey
mergetool: R
e
move explicit references to /
d
e
v/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
h
arles Bailey
st
a
sh tests: stash can lo
s
e
data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Cha
r
le
s
Bai
l
ey
stas
h
: Don't overwrite fil
e
s
that have gone fro
m
the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles
B
ailey
Documentation: Describe
other situations where -z affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
B
ailey
Change xd
l
_mer
g
e to gene
r
a
t
e output ev
e
n for
n
ull me
r
ges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles
Bailey
t6023: m
e
rge-file fa
i
ls to output
a
nythi
n
g
for a degenerat
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bailey
m
erge
t
ool
:
fix
running
mergetool in sub-di
r
e
c
tories
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles
Bailey
merge
t
ool:
Add a test
f
or running m
e
rgetool
i
n a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Cha
r
les Baile
y
mergetool: respect autocrlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bai
l
ey
mergeto
o
l
: Don't keep tempora
r
y merge
files unle
s
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
C
h
arles B
a
i
l
ey
me
r
getool
:
Add
p
rompt t
o
con
t
inue af
t
er fail
i
n
g to
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bai
l
ey
Add -
y
/--
n
o-prompt option to
m
ergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
F
i
x some tab/
s
pace in
c
onsistenc
i
es i
n
git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charl
e
s Bailey
git-arch
i
ve: work in bare re
p
o
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Bailey
Make git
a
r
chive resp
e
ct core
.
auto
c
rlf whe
n
creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charle
s
Baile
y
Add
n
ew te
s
t t
o
demo
n
strate git archive core
.
autocr
l
f
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
me
r
ge-tool
documen
t
ati
o
n: descr
i
b
e
custom comma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harles Bailey
git-mergetool documentait
o
n: show tooln
a
mes in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Add a very basic test script for
g
it mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
h
arles Bailey
Te
a
c
h
g
i
t mergetool to use custom c
o
mm
a
nds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Changed a
n
inter
n
al
variable of mergetool to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charl
e
s Bailey
Tidy up g
i
t mergetool's backu
p
f
i
le be
h
avio
u
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charl
e
s Bailey
gitk: Fix the Makefi
l
e
to cope w
i
th sys
t
ems la
c
king
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Cha
r
les B
a
iley
Rem
o
ve ol
d
generated
fil
e
s
f
rom
.
g
i
tignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
Charles Bailey
Fix git-instaweb breakage on M
a
cOS X
due to
t
he limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Baile
y
Fix clone not to ignore depth when perfo
r
ming
a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree