repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Builtin-ify git-notes
2010-01-19
J
u
nio
C Haman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C
Hama
n
o
Update dr
a
ft release notes t
o
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
i
o
C Hamano
M
e
rg
e
b
ran
c
h 'dp
/
maint-1
.
6
.
5-fast-i
m
po
r
t-non-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Juni
o
C Haman
o
M
e
rge branch 'jc
/
re
r
e
r
e'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merg
e
branch 'pc/uninteresting-su
b
module-d
i
sa
p
pear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch
'
nd/include-t
e
r
m
ios-for
-
osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merge branch 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Andreas Gr
u
e
n
bacher
buil
t
in-appl
y
.
c: fix the --- a
n
d +++ header filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
a
nie
l
B
a
rkalow
Replac
e
parse_blob
(
)
with an explanatory comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C Hamano
M
erge
bran
c
h 'jm/maint
-
1
.
6
.
5-gr
e
p
-
NU
L
-term
i
nate' into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
Meyering
g
r
e
p: NUL t
e
rmin
a
te input from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gruenbacher
builtin-appl
y
.
c: Ski
p
filenames without enoug
h
c
omponents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
symlin
k
s
.
c: r
e
move unused functi
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
a
no
obj
e
ct
.
c: remove
u
nu
s
ed f
u
n
c
ti
o
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Jun
i
o C Hama
n
o
Document t
h
at merge
s
trategies can now take
t
h
eir own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Exten
d
merge-subtree t
e
sts to test -Xsubtree=dir
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
m
ano
Mak
e
"subtree"
p
art
more
orthogonal to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C
H
amano
pull:
Fix parsi
n
g
of -X<opt
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Aver
y
Pennarun
Teach gi
t
-pull to
p
a
ss -X
<
option> to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Pennarun
g
it merge -X<op
t
i
on>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
u
nio C Hamano
Update
d
raft 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 b
r
anch 'tc/test-locat
e
-
h
ttpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Merge branch 'jh/commit-status'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Merge branch 'jn/make
f
ile'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hamano
Merge branch 'jc/
m
aint-1
.
6
.
1-chec
k
out-m-custom-mer
g
e
'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Hamano
Merge branch 't
c
/clone
-
v-progre
s
s'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
a
m
a
n
o
Merge branch 'tc/smar
t
-
http-res
t
rict'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C Haman
o
Merge branch 'jk/run
-
command-us
e
-sh
e
ll'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
Merge branch
'
sr/gfi-opt
i
on
s
'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Ha
m
ano
U
p
date
C
OPYING w
i
th GPLv2
w
ith
n
ew F
S
F address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o C Hamano
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
Junio C Ha
m
ano
user_iden
t
_suffi
c
ie
n
t
ly_given()
:
r
e
factor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: hon
o
r
c
onflict-marker-size at
t
ribut
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: prepare for
customizable con
f
l
ict marker lengt
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Ha
m
ano
commit
.
c::print_summary: do not
r
elea
s
e
th
e
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
conf
l
i
ct-m
a
rker-size:
n
ew attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rerere: use
l
l_merge() inste
a
d of using xdl_
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
m
e
rge-t
r
ee:
use
l
l_merg
e
() not xdl_merge
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C Hamano
xdl_
m
erge(): all
o
w
p
a
s
sing down ma
r
ker_size in xm
p
aram_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
xdl_merge
(
)
:
i
n
t
r
oduce
x
m
param_t for merge spe
c
ific
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
a
no
git_a
t
tr(): fix function sign
a
ture
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Do
n
ot use d
a
t
e
.
c
:tm_to_time_t() from compat/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
Haczewski
MSVC: Wind
o
ws-native
imp
l
eme
n
tation fo
r
subset o
f
P
threads API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Merge
b
ra
n
ch 'cc/r
e
set-m
o
re'
commit
|
commitdiff
|
tree
2010-01-17
Ramkuma
r
R
amac
h
a
ndra
Docum
e
ntat
i
o
n: Upda
t
e git core tutor
i
al clarifying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay Jon
e
s
M
SVC: Fi
x
an "incompat
i
ble po
i
nter ty
p
es" c
o
mpiler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
o
hannes
S
ixt
Windows:
a
void th
e
"dup da
n
ce" whe
n
spaw
n
ing a c
h
ild
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes
S
ixt
W
i
ndo
w
s: simplify
t
he pipe(2) im
p
le
m
entation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Si
x
t
Windows: boo
s
t
startup by avo
i
ding a st
a
t
ic
d
ependency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Erik Faye-Lund
Windows
:
disable Python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
I
lari Liusva
a
ra
Add
p
ush --set-up
s
tream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Christi
a
n Coud
e
r
t7111:
f
ix bad HEAD in
tests
w
i
th un
m
erged entries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
D
avid Agui
l
ar
difftoo
l
: Update co
p
yrig
h
t notices to
l
i
s
t e
a
ch year
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Richard Weinbe
r
ger
Fix u
n
initialized varia
b
le in get_refs_
v
ia
_
rsync()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
T
a
rmigan Case
b
o
lt
Te
s
t
t5
5
60: Fix test
w
hen run with dash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Ngu
y
ễn Thái Ngọc
D
uy
status
:
only touch p
a
t
h
w
e may need to check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid Aguilar
difftool: Use
eval to
exp
a
n
d
'
-
-
ex
t
cmd' exp
r
ess
i
ons
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
a
vid A
g
uilar
difftool: Add '-x
'
and a
s
an alias for '--extc
m
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t
7800-difftool
.
sh: Sim
p
li
f
y
t
he -
-
extcmd tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Hamano
g
re
p
--n
o
-
index: allow
u
se o
f
"git gre
p
"
outsi
d
e a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio
C Hamano
g
r
ep: prepare
to run outside o
f
a work t
r
ee
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Ramku
m
a
r
Ramachan
d
ra
Docume
n
t git-blame triple
-C
opt
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Potap
o
v
fast-im
p
o
rt: 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: al
l
o
w
s
u
ppression of implicit i
d
e
nt
i
ty advice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
K
ing
commit: show
interesting ident in
f
ormation i
n
summary
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf: add strbuf_addbuf_percentquote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strbuf_expand: convert
"%
%
"
to "%"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Micha
e
l Haggerty
rebase -i: Retain user
-
edited
c
ommi
t
me
s
sages af
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Micha
e
l Haggert
y
t3
4
04: Set up m
o
re of the te
s
t repo in the "setup"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
ty
r
e
b
a
se
-
i: For fixup command
s
without squ
a
sh
e
s, do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael Ha
g
gerty
reba
s
e
-
i: Cha
n
ge function make_sq
u
ash_message into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
r
e
base -i:
E
xtr
a
ct functi
o
n
do
_
with_author
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
c
h
a
el Hagger
t
y
r
ebase
-i: Handle the au
t
hor scr
i
pt
all in one place
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
reb
a
se -i: Extra
c
t a function "commit_message"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mi
c
hael
H
aggert
y
rebase -
i
: Simplify commit counting for generated comm
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagger
t
y
rebas
e
-
i: Improve consis
t
ency of commit count in generated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
t3404: T
e
st the c
o
mmit count in commit
m
essages genera
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase -i: Intr
o
duce a cons
t
ant AMEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase -i: Int
r
oduce a constant AUTHOR_SCRIPT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
c
hael Haggerty
rebas
e
-i: Document
how tem
p
orary
fi
l
es
are used
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagg
e
rty
reb
a
s
e -i:
Use symbo
l
ic
c
onstan
t
$M
S
G con
s
i
sten
t
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Ha
g
g
e
rty
rebase -i: U
s
e "test -n
"
instead of "t
e
st ! -z"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
Haggerty
reba
s
e
-i: Inline ex
p
ression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Micha
e
l Hagger
t
y
r
e
base -i: Remove dead cod
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggert
y
r
e
base -i
:
Make the
c
o
n
d
ition
for
a
n "if
"
more
t
ra
n
spar
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge branch 'j
c
/checkou
t
-me
r
g
e-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
H
a
mano
Me
r
g
e
branc
h
'rs/maint
-
ar
c
hive-match
-
pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio C
Hamano
M
e
rge branc
h
'il/vcs-h
e
lpe
r
'
commit
|
commitdiff
|
tree
2010-01-13
J
u
nio
C
Hama
n
o
strbuf_addbu
f
(): allow
p
assin
g
the same
b
uf to
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Haman
o
M
e
rge branch 'cc
/
re
s
et-more'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
ano
Merge
branch 'nd/s
p
arse'
commit
|
commitdiff
|
tree
2010-01-13
Ju
n
io
C Hama
n
o
t
7
502: test commit
.
s
tatus, --status
a
nd --no-st
a
tus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Juni
o
C H
a
m
an
o
grep
:
rip out pessimizatio
n
to use
fixmatch()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ha
m
an
o
grep: ri
p
out support for external grep
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Jam
e
s P
.
Howa
r
d, II
commit: su
p
port co
m
mit
.
status, -
-
status, and --n
o
-status
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Junio C Hamano
Merge
b
r
anch 'm
a
i
nt
'
commit
|
commitdiff
|
tree
2010-01-12
Matthie
u
Moy
loc
k
fil
e
: show
a
b
solute filename i
n
u
n
able_to_lock_mes
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Bart
T
rojanowski
hg-to-git: f
i
x COMM
I
T
T
ER ty
p
e
-
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-12
Matthieu
M
oy
Be more user-
f
riendly when r
e
f
u
sing to do something
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next