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
t5801 (remote-helpers): cleanup environment sets
2014-03-31
Charles
Bai
l
ey
tests:
don't rely on s
t
re
r
ror text wh
e
n tes
t
ing rmdir
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bai
l
ey
dir
.
c
: make gi
t
_fnmatch() not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Cha
r
le
s
Bailey
m
ergetool:
Remov
e
e
x
plicit re
f
er
e
n
ces to
/
dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
C
harles
B
ai
l
ey
s
t
ash
tes
t
s: st
a
sh ca
n
lose data in a file r
e
m
o
ved
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
C
h
a
rles
Bailey
st
a
sh:
D
o
n't ove
r
wr
i
te files that have gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charl
e
s Bailey
Documentation
:
D
e
s
c
ribe
o
t
her situa
t
i
ons whe
r
e -z affect
s
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charles Bailey
C
han
g
e xdl_merge t
o
g
e
n
erate output
e
ven for n
u
ll merges
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Char
l
e
s
Bailey
t6023: merge-file fail
s
t
o output anything for a
d
egenerate
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Cha
r
les
Bailey
m
erge
t
ool:
f
ix running
mergetool in sub-dir
e
cto
r
ies
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charle
s
Bailey
m
e
rge
t
ool: Add
a
t
est for ru
n
n
i
ng mergetool in a s
u
b
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
Char
l
es Bailey
mergetool:
r
espect autocrlf by u
s
ing ch
e
c
k
out-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Char
l
es Bailey
mergeto
o
l: Do
n
't keep temporary merge files u
n
less
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charle
s
Bail
e
y
mergetool
:
Add prompt t
o
continu
e
af
t
er fai
l
in
g
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
r
les Bailey
Add -
y
/--n
o
-pr
o
mpt
o
ption to mergetool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
C
h
arles B
a
iley
Fix
some tab
/
space i
n
consi
s
tencie
s
i
n
git-mergetool
.
sh
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
C
harle
s
Bailey
git-archive: work in bare repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Cha
r
les Bailey
Make git arch
i
ve
respect core
.
autocr
l
f when creating
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
C
h
arles Bailey
A
d
d new test to dem
o
nstrate git ar
c
hive
core
.
autoc
r
lf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charles Bailey
mer
g
e
-
tool documentation: describe custom command usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Charle
s
Bail
e
y
git-merget
o
ol docume
n
taito
n
:
s
how tool
n
a
mes in typewriter
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
d
d a ve
r
y basic t
e
st script for g
i
t m
e
r
g
et
o
ol
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Teach g
i
t
mergetoo
l
t
o
use
c
ustom comma
n
ds defined
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Ch
a
rl
e
s Bail
e
y
Changed an internal variable o
f
mergetool to
s
upport
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles Bailey
Tid
y
up git mergetool's backup file b
e
hav
i
o
ur
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles Bailey
gitk: Fi
x
the Makefile
to cope with systems lac
k
i
ng
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Ch
a
rles
Bailey
Remove old generated files from
.
gitignore
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
harles B
a
iley
Fix git-in
s
taweb
br
e
akage on Ma
c
OS
X
d
u
e
t
o
t
he limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charles Bailey
F
i
x clone
not to ignore depth when
p
er
f
o
r
ming a local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree