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
Make difftool.prompt fall back to mergetool.prompt
2010-01-18
Junio C Hamano
pull:
Fix parsing of -X<optio
n
>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
Pennarun
Te
a
ch git-pull to
p
a
ss -X<opti
o
n> to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
git merge
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Update draft release notes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'tc/test
-
locate-h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge bran
c
h '
j
h/
c
om
m
i
t-status'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'jn/
m
akefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
Merge branch 'jc/maint
-
1
.
6
.
1-ch
e
ckout
-
m-custom-
m
erge'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge br
a
nch 'tc/cl
o
ne-v-progres
s
'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branc
h
'tc/smart-http-restri
c
t'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Haman
o
Merge
br
a
n
c
h 'jk/
r
un-
c
ommand-
u
se-shell'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Mer
g
e
b
ran
c
h
's
r
/gfi-options
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Update C
O
P
Y
I
NG with
GPLv2 wit
h
new
FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
u
s
er_ident_sufficie
n
t
l
y
_given():
r
efactor
t
he lo
g
ic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
user_
i
dent_sufficien
t
ly_given(
)
:
refactor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
re
r
ere
:
honor conflict-
m
arker-size attr
i
bute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o
C Hamano
rerere
:
prepare for custom
i
za
b
le con
f
lict m
a
rker
l
ength
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
co
m
mi
t
.
c::pr
i
nt_s
u
mmary: do
not r
e
lea
s
e the format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
uni
o
C Ha
m
a
no
confli
c
t-mar
k
er
-
size: new a
t
tribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
re
:
use ll_me
r
ge() instead of us
i
ng
x
d
l_merge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ham
a
no
merge-tree: use ll_merge() not xdl
_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
xdl_m
e
rg
e
(): all
o
w
passing down
m
arker_
s
iz
e
in xmparam
_
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Ham
a
no
xdl_
m
erge()
:
in
t
roduce xmparam_t
f
o
r
merge specific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
g
it_attr(): fix f
u
n
c
t
ion
s
ignature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes
S
ixt
Do not us
e
date
.
c:t
m
_
to_time_t() from compat/ming
w
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
Hacz
e
wski
M
SVC: W
i
ndows
-
native im
p
lementation for
s
ubset of Pthreads
API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Haman
o
Mer
g
e branc
h
'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Me
r
g
e
bran
c
h '
c
c/reset-more'
commit
|
commitdiff
|
tree
2010-01-17
Ramkumar Ramacha
n
dra
Documen
t
ation: Update
g
it core
tutor
i
al c
l
arifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ra
m
say Jone
s
MSVC:
F
i
x an
"incomp
a
t
i
b
le pointer typ
e
s
"
compiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes Sixt
Windows:
a
void the "dup dance
"
when s
p
a
wning
a
c
hil
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
o
hannes Sixt
Windows: simplify the pipe(2
)
impl
e
menta
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windo
w
s: boost sta
r
tup by avoidi
n
g
a
static depe
n
dency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Erik F
a
ye-Lund
W
i
nd
o
ws:
d
isable Python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ilari Li
u
svaara
Ad
d
p
ush --
s
et-upstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Christian Couder
t
7
11
1
:
fix
b
ad HEAD i
n
tests
with unm
e
rged
ent
r
ies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
David Aguilar
difftool: Up
d
ate co
p
y
r
ight notices to list each year
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
R
i
char
d
Weinberger
Fi
x
uninitialized va
r
iab
l
e in get_refs_
v
ia_rs
y
n
c()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Tarmiga
n
Ca
s
eb
o
lt
Test t5560:
Fix t
e
st wh
e
n
r
un
w
it
h
das
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Ng
u
yễn Thái
N
gọc Duy
status: only touch path we may need t
o
check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguil
a
r
difftool: Use eval to e
x
pan
d
'--extcmd' ex
p
r
essions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Davi
d
A
guilar
difftool: Ad
d
'-x'
a
nd as an alias for '-
-
extcm
d
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7800-difftool
.
sh: Simpli
f
y t
h
e --extcmd
test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Hamano
grep --no-index: allow us
e
of "git
g
rep" outside a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
grep:
pr
e
p
a
re
t
o run outside of
a
w
ork tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ramkumar Ramachand
r
a
D
o
c
u
m
e
nt git-blame triple -C option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmi
t
ry
P
otapov
fast-import: tag may po
i
nt to any object
type
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
commit: allow supp
r
e
s
sion of imp
l
icit identity advice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
com
m
it: s
h
ow in
t
eresting id
e
nt informatio
n
in
sum
m
ary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Je
f
f K
i
ng
strbuf: add
s
trbuf_addbuf_p
e
rcentquot
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
J
e
f
f
King
s
t
r
buf_expand
:
convert "%%" to "%"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase
-i: Retain user-
e
dited commit messages af
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
t3404
:
Set
u
p more
o
f the test repo in
th
e
"
setup"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
t
y
reb
a
se -i:
F
or
f
i
x
up commands w
i
thout squas
h
es, do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
H
a
g
gerty
r
e
bas
e
-i: C
h
ang
e
function make_sq
u
ash_messag
e
into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggert
y
rebase -i: Extract function do_with
_
au
t
hor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggert
y
rebase -i: Hand
l
e the auth
o
r script
all in
one plac
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael Haggerty
rebase -
i
:
E
x
tract a
f
uncti
o
n
"
c
o
mmit_message"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
ebas
e
-i: Simplify commi
t
counting for generated commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
ty
re
b
ase
-
i
: Improve c
o
nsistency o
f
co
m
mi
t
count
i
n
generated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
t3404:
T
est t
h
e c
o
mm
i
t count in commit m
e
ss
a
ge
s
ge
n
erate
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Ha
g
gerty
r
ebase -i: In
t
roduce a constant
A
MEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mich
a
e
l Ha
g
gerty
rebas
e
-i: Introduce a constant A
U
T
HOR_SCRIPT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggert
y
rebase -i:
D
ocument ho
w
temporary file
s
ar
e
u
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
e
base -i: Us
e
s
ymbolic constant $MSG consistently
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mi
c
ha
e
l
H
aggerty
rebase -i: Use "test -n" instead of "test ! -z"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase -i:
I
nline ex
p
res
s
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hag
g
erty
re
b
a
se -i:
Re
m
ove dead code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggert
y
rebas
e
-i: M
a
ke
th
e
condition for an
"i
f
" more transpa
r
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio C Hamano
M
e
rge
branch
'jc/checkout-mer
g
e-bas
e
'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge
bran
c
h 'r
s
/maint
-
archive-match-p
a
thsp
e
c'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branch
'
il/vcs-h
e
l
p
er'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
strbuf_addb
u
f
(
): allow pas
s
i
n
g
the sa
m
e bu
f
to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hamano
Merge b
r
a
nch 'cc/res
e
t-more'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio
C
Hamano
Merge branch '
n
d/sparse'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
t7
5
02: t
e
st commit
.
st
a
tus,
-
-
s
tatus and --no-
s
t
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
grep:
rip out pe
s
s
i
miza
t
i
o
n to use
fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jun
i
o
C
Ham
a
no
g
re
p
: rip out support fo
r
external g
r
ep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
James P
.
How
a
r
d, II
commit: support c
o
m
mi
t
.
s
t
atus,
-
-status, and --no-st
a
tu
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
M
erg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-01-12
Matthie
u
Moy
lockfile: sh
o
w
a
bsolute
f
ilen
a
me in
unable_to_lock_message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Bar
t
Trojanowski
hg-to
-
git: fix
COMMITTER type
-
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Matthi
e
u Moy
Be more user-
f
riendly wh
e
n refusing to d
o
so
m
ethi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ilari Liusv
a
ara
Improve
error mes
s
ag
e
wh
e
n a transport helper was not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Sha
w
n
O
.
Pearce
remote-c
u
rl: Fix Accept header for smart HTTP
conne
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Michael Haggerty
reba
s
e
-
i: Ignore
comments
a
n
d
b
lank l
i
n
e
s
in p
e
ek_ne
x
t_co
m
m
a
nd
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Michael Hagg
e
rty
lib-rebase: Allow c
o
mment
s
and blank lines to be added
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Michael Haggerty
lib-reb
a
s
e
: Provide c
l
earer debu
g
g
i
ng inf
o
about what
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o C H
a
mano
strbuf
.
c
: rem
o
ve unused fu
n
c
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C
Hamano
sha1_fi
l
e
.
c
:
r
e
move unuse
d
function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Ha
m
an
o
mailmap
.
c: re
m
o
ve unused function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Hamano
utf8
.
c: mark file-local funct
i
on stati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
s
u
b
module
.
c:
ma
r
k file-l
o
cal function
s
tati
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Hamano
qu
o
te
.
c: m
a
rk f
i
le-loca
l
f
u
nctio
n
st
a
tic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
J
unio C Hamano
r
e
mote
-
curl
.
c: mark
file-local function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Jun
i
o
C
H
ama
n
o
read-cache
.
c: ma
r
k file-local f
u
nctions static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io
C
Haman
o
parse-options
.
c:
m
a
rk
fil
e
-l
o
cal function static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Ju
n
io C
Hamano
entry
.
c: ma
r
k file-local function
s
tatic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
http
.
c: mark file-lo
c
al functions static
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio
C
Ha
m
ano
Merg
e
bran
c
h 'j
c
/m
a
int-1
.
6
.
4-
g
rep-lookah
e
ad' int
o
jc
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next