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 'mg/maint-tag-rfc1991'
2010-11-17
Junio C Hamano
Me
r
ge
branch 'jn/send-p
a
c
k
-err
o
r'
commit
|
commitdiff
|
tree
2010-11-17
Junio C
H
a
m
ano
Merg
e
br
a
n
ch 'mg/make-prove'
commit
|
commitdiff
|
tree
2010-11-17
Ju
n
io C Hamano
Merge
b
r
anch
'
kb/completion-checkout'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ha
m
ano
Merge branch 'sg
/
completion'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge
b
ranc
h
's
g
/bis
e
ct'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Me
r
ge
b
r
a
n
c
h
'ak/s
u
bmodule-sync'
commit
|
commitdiff
|
tree
2010-11-17
Junio
C Haman
o
Merge branc
h
'jk
/
m
a
int-rev-list-nul'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Ha
m
ano
Merge b
r
a
n
ch 'k
s
/no-textconv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branch
'jn/gitweb-t
e
st'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge b
r
anch 'cb
/
diff-f
n
a
me-optim'
commit
|
commitdiff
|
tree
2010-11-17
J
u
nio
C Hamano
Merge branch '
j
k/
n
o-textconv-symlink'
commit
|
commitdiff
|
tree
2010-11-17
Junio C Hamano
Merge branc
h
'dk/ma
i
nt-blame-
e
l'
commit
|
commitdiff
|
tree
2010-11-17
Juni
o
C Hamano
Merge branch
'
m
a
i
nt
'
commit
|
commitdiff
|
tree
2010-11-17
Br
i
an G
e
rnhard
t
t6022: Use -eq not
=
to te
s
t o
u
t
p
ut of
wc -l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Nguyễ
n
T
h
ái Ngọc Duy
c
l
ean: re
m
ove re
d
undant variable bas
e
len
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an He
r
land
Provide 'git mer
g
e
-
-abort'
a
s a
s
ynon
y
m to
'
git res
e
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
c
md_merge()
:
Parse
options before
c
hec
k
ing MERGE_HEAD
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
a
n
d
Prov
i
de '
g
it notes
g
et-ref' to easily retrieve current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git n
o
tes
merg
e
: Add testcases for merg
i
ng n
o
tes trees
.
.
.
-
Junio C Hamano
: Portability: Don't string-compare...
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git notes merge: Add another
a
u
t
o
-resolving s
t
r
a
teg
y
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
git n
o
tes
m
e
r
g
e: --commit
shoul
d
f
ail if
u
nderlying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: List conflicting note
s
in
n
otes merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s
merge: Manual c
o
nflict
resolution,
part 2/
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
H
erland
git notes merge: Manu
a
l confl
i
c
t
resolut
i
on
,
part 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Doc
u
mentati
o
n
:
P
r
e
lim
i
na
r
y docs on '
g
it n
o
t
es merge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git no
t
es
merge: Add automatic conflic
t
r
e
solvers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git not
e
s merge: Handle real, non-c
o
nflicting notes
.
.
.
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
builtin
/
notes
.
c: Refactor creation
of n
o
tes commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
g
i
t not
e
s merge:
Ini
t
ial implementation ha
n
d
lin
g
tr
i
vial
.
.
.
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
builtin/notes
.
c: S
p
li
t
notes ref DWIMmery into a sep
a
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
notes
.
c: Use two newlines (ins
t
ead of one) when
concatenati
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
(trivial)
t3303: Inden
t
with
tabs instead
o
f
spaces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n
Herland
notes
.
h/c: Propagate combine_note
s
_fn
r
eturn value
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Juni
o
C H
a
mano
Merge
bran
c
h 'mz/m
a
int-r
e
base-X-fix
'
into
m
ai
n
t
commit
|
commitdiff
|
tree
2010-11-17
Martin vo
n
Zweigb
e
rgk
D
ocum
e
n
t
ation/git-pull
:
clari
f
y
c
o
nfiguration
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Yann Dirson
Docu
m
ent that rev-list --graph triggers pa
r
ent rewriting
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-16
N
g
uyễn Thái Ng
ọ
c
D
u
y
clea
n
: avoid qu
o
t
i
ng twice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-16
Jeff King
document
s
igc
h
ain
api
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-16
Yann Dirso
n
Keep to
g
et
h
er
o
ption
s
con
t
rolling the behaviour
o
f
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Clemens
Buchacher
u
s
e
p
e
rsiste
n
t
m
emory
f
or
r
ejec
t
ed
p
aths
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Junio C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-11-15
René S
c
harfe
verify-tag: document
--ver
b
ose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
br
a
n
c
h: i
m
prov
e
-
-verbos
e
desc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René
S
charfe
a
r
chive: improve --v
e
rbose desc
r
iption
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Jonathan Nied
e
r
D
e
scribe variou
s
forms of "be quiet
"
using OPT_
_
QUIET
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Sc
h
a
rfe
add OPT__FOR
C
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
a
dd descr
i
ption par
a
meter
t
o
OPT__QUIET
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René
S
charf
e
ad
d
des
c
ription
p
aram
e
ter to OPT__DRY_
R
UN
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
René Scharfe
add description param
e
ter to OP
T
__VER
B
OSE
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-15
Clemens
B
uc
h
ach
e
r
do
n
ot
o
ve
r
write untrack
e
d du
r
ing merge from u
n
born
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-14
Ævar Arn
f
jörð
B
jarmason
tests:
u
s
e
test_cmp inst
e
ad of piping to
diff(1)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-14
Ævar Arnfj
ö
rð B
j
a
rmason
t7004-tag
.
sh: re-arrang
e
git tag comment for clarity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-12
Antonio
Ospite
g
it-send
-
em
a
il
.
p
erl: ma
k
e
initial
I
n-Reply-To apply
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-11
J
unio C Hamano
t34
0
2:
t
est "rebase -s<stra
t
e
gy> -X<op
t
>
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-11
Jon
a
than
N
ie
d
e
r
Documenta
t
ion: point to related co
m
mands fro
m
gitigno
r
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-11
Jonathan
N
ieder
D
o
cumentation: split
g
itignore pa
g
e
i
n
to se
c
tions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jona
t
han Nieder
Rem
o
v
e
p
ack file handling dependency from wrapper
.
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan N
i
eder
pack-obj
e
cts: ma
r
k file
-
local va
r
iable sta
t
i
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Ni
e
de
r
wrapper: give
zlib wrappers thei
r
o
wn translat
i
on un
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonatha
n
Nieder
str
b
uf: move strbuf_br
a
nchname t
o
sh
a
1_name
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan
N
i
eder
path
h
elpers: move git_mk
s
te
m
p
*
to w
r
apper
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jon
a
than Nieder
wrapper: mov
e
od
b
_* to environm
e
nt
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan N
i
ed
e
r
w
rapper: m
o
ve xmmap() to sha1_fi
l
e
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h/c: Allow combin
e
_n
o
tes fu
n
ctions to
r
em
o
ve
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
nd
notes
.
c: Reorder functi
o
ns in p
r
epa
r
ation
f
or next
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herland
notes
.
h: Make
d
efault_notes_ref() ava
i
labl
e
in notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han
Herl
a
n
d
(trivial
)
not
e
s
.
h
: Minor documentation fixes to
co
p
y_notes
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
c: Hexify SHA1 in
d
ie(
)
messa
g
e f
r
om init_not
e
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
tag: recogni
z
e
rfc1991 signatures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Mi
c
ha
e
l J Gruber
tag: facto
r
ou
t
sig det
e
ction for tag display
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J
G
r
u
ber
tag:
fact
o
r
o
ut
s
ig d
e
tect
i
on for body edits
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Michael J Gruber
verify-tag: factor out
s
i
g
nature
d
etection
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
M
ichael J Gruber
t/t7004-tag
:
test handling of rfc1991 signatures
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Martin von Zweig
b
ergk
re
b
ase -
X
: do n
o
t clo
b
be
r
strategy
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
n
athan Nieder
cherry-pic
k
/rev
e
rt
:
transparently r
e
fresh index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jonathan Nieder
apply
:
handle patc
h
es wit
h
f
u
nny
filename an
d
c
olon
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jeff King
doc
s
: give
more
h
i
nts
about how "add
-
e" w
o
rks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
J
o
nat
h
an
Niede
r
t4124 (apply --whitespace): use test_might_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Junio C Hamano
t3404: do
n
ot use 'des
c
ribe' to imp
l
ement test_cmp_rev
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Ni
e
der
t34
0
4
(rebase -i): i
n
troduce
h
e
lper
to
c
heck pos
i
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jona
t
han Nieder
t3404 (
r
e
base -
i
): move
c
omment to
description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t3404 (rebase -i): un
r
oll test_commi
t
loop
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t
3
301 (
n
otes): use
t
est
_
expect_code for clarity
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t1400 (upd
a
t
e
-ref): use
t
est_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t1502 (rev-parse --pa
r
seo
p
t): test e
x
it
code from "-h"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t6
0
22 (re
n
am
i
ng merge): c
h
ain test c
o
mm
a
nds wit
h
&&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
test-lib: introduce test_line_count to measure files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan Nieder
t
e
s
ts: add
m
issin
g
&
&, batch 2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonath
a
n N
i
eder
tests: add
m
issing
&
&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
J
u
ni
o
C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-11-09
Kevin Ballard
rebase: teach --autosquash
to ma
t
ch on sha1 in add
i
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Kevin Ballard
reba
s
e: bett
e
r rearranging of fixup!/squash! li
n
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Jonathan
Nieder
D
o
cument
a
tion: d
o
cument show
-s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-09
Kevi
n
Ballard
status: Quot
e
paths
w
ith sp
a
ces in short format
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-08
N
g
uyễn Thái Ngọc Du
y
dir
.
c: fix EXC_F
L
AG_MUSTBEDIR ma
t
ch in sparse che
c
k
o
u
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-05
Junio C Hamano
test:
gi
t
-
apply
-
p
2 rename/ch
m
od
only
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-05
Federico
Cuello
F
i
x git-apply with -p greater
t
han 1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-05
Jun
i
o C H
a
man
o
t9001: se
n
d-email in
t
er
a
t
io
n
with --in-
r
eply-to and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-05
Junio C Ham
a
no
Merg
e
branch 'aw/git-p4-deletion'
commit
|
commitdiff
|
tree
2010-11-05
Junio
C Hamano
Merge
branch
'
m
aster' o
f
git://repo
.
or
.
cz
/
g
i
t-gu
i
commit
|
commitdiff
|
tree
next