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
Documentation/config.txt: document mailinfo.scissors
2014-07-01
Charle
s
Bailey
filter-branch: eliminate duplicate mapped par
e
nts
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-05-02
C
harles
B
ailey
c
o
mpat/b
s
wap
.
h: dete
c
t en
d
ianness on more platform
s
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charl
e
s Bailey
tests:
do
n
't rely on strer
r
or text
whe
n
testing rmdi
r
.
.
.
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2014-03-31
Charles Bailey
dir
.
c: make git_fnm
a
tch
(
) not inline
Signed-off-by:
Charles Bailey
<cbailey32@bloomberg.net>
commit
|
commitdiff
|
tree
2010-08-20
Charle
s
Bailey
mergetool: Remo
v
e exp
l
i
cit ref
e
rences to /dev/tty
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-20
Cha
r
l
e
s
Bailey
s
t
ash tests: stash c
a
n
l
ose data in a file removed
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
s
t
a
sh: Don't overwrite fil
e
s that ha
v
e gone from the
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2010-04-18
Charles Bailey
Docume
n
tation: Describ
e
other situations where -z
affects
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
Charl
e
s Bailey
Change xdl_merg
e
t
o generate output even
fo
r
null m
e
rge
s
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-05-25
C
harles Baile
y
t6
0
23: me
r
ge
-
file fails to output a
n
yth
i
ng for a de
g
ener
a
t
e
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bail
e
y
merg
e
too
l
: fix running merget
o
ol
in
s
ub
-
direct
o
ries
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-31
Charles Bai
l
ey
merg
e
tool:
A
dd a test
f
o
r running m
e
rge
t
ool i
n
a sub
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2009-01-27
C
h
arl
e
s Bai
l
ey
merg
e
to
o
l
: re
s
p
ect au
t
o
c
rlf by using checkout-index
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Bailey
mergetool: Don't
k
eep temporary merge files u
n
l
e
ss
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-12-13
Charles Ba
i
ley
merge
t
ool:
A
dd prompt to c
o
ntinue after fail
i
ng
t
o
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Charles Bailey
Add -y/-
-
no-prompt
o
ption to
me
r
getool
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-11-15
Ch
a
rles Ba
i
ley
Fix som
e
ta
b
/space inconsistencies in gi
t
-
m
e
rgetool
.
s
h
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-10-26
Charles B
a
iley
git-
a
rchive: work i
n
b
a
re repos
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Char
l
es B
a
iley
M
ake git
a
rchiv
e
respect core
.
a
u
tocrlf when c
r
e
a
t
i
n
g
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-09-19
Charles
Bailey
Add new test to demo
n
strat
e
git archive core
.
autocrlf
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
Ch
a
r
l
es
B
ailey
merge-tool documentation: desc
r
i
be
c
us
t
om
comma
n
d usage
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-08
C
harl
e
s Bailey
git-merg
e
tool d
o
cumentai
t
o
n:
s
how tool
n
ames in type
w
rite
r
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
A
d
d a very
ba
s
ic t
e
s
t
script
f
or g
i
t me
r
geto
o
l
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bailey
Teach gi
t
mergeto
o
l to
use custom comma
n
ds define
d
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
Charles Bail
e
y
Changed an
i
nternal var
i
able
o
f merge
t
o
o
l to support
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-03-05
C
harles
B
ai
l
ey
Tidy
u
p git mergetool
'
s backup file
b
e
haviou
r
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2008-01-11
Charles
B
a
iley
g
itk: Fix the Makef
i
le
to cop
e
wi
t
h syste
m
s lacking
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-21
Charles
B
a
iley
Re
m
o
ve old g
e
nerated f
i
l
es from
.
gitignor
e
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-19
C
h
arles Bai
l
ey
Fi
x
git
-
inst
a
web bre
a
kage on
M
acOS X du
e
to the limited
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree
2007-12-12
Charl
e
s Bailey
Fix
c
lone
n
o
t to ignore depth when performin
g
a
local
.
.
.
Signed-off-by:
Charles Bailey
<charles@hashpling.org>
commit
|
commitdiff
|
tree