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
git notes merge: Handle real, non-conflicting notes merges
2010-11-17
J
oh
a
n Herland
git notes merg
e
: Handle r
e
a
l, non-conflicting 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
Johan
Herland
builtin/no
t
es
.
c: R
e
factor
c
reation of notes
co
m
mits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: Initial implementation handling trivial
.
.
.
-
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 Herlan
d
builtin
/
notes
.
c
:
Spl
i
t no
t
es
ref DWIMmery int
o
a sepa
r
ate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
land
notes
.
c: Use two n
e
wlines (instead
o
f on
e
) when c
o
ncate
n
ati
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
land
(tri
v
ial) t33
0
3:
Ind
e
nt wi
t
h
tabs
i
ns
t
ead
of spaces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
note
s
.
h/c: Propagate combine_n
o
tes_f
n
return va
l
u
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han H
e
rland
n
ote
s
.
h/c:
Allow combine_not
e
s
fu
n
c
tions to remove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
not
e
s
.
c: R
e
order functio
n
s
i
n preparation for next
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herl
a
n
d
not
e
s
.
h: Mak
e
d
e
fau
l
t_not
e
s_r
e
f() available
i
n
notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Herland
(trivial)
n
otes
.
h: Minor docume
n
tation fixes to copy_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan H
e
rla
n
d
note
s
.
c
:
Hexi
f
y
S
H
A
1
in die(
)
me
s
sage from i
n
it_not
e
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
R
e
né Sc
h
arfe
n
o
t
es: allow --dr
y
-
r
un for -n
and --
v
erbo
s
e fo
r
-v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Matthieu Moy
Document
-B<n>[/<
m
>
],
-
M<n> and
-C<n>
variants of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
Documentation:
c
ite git-a
m
fr
o
m
g
i
t
-
apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas
R
ast
t7003: fi
x
sub
d
i
re
c
tory-filter t
e
st
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
onathan Nieder
Allow "check-ref-format
--branch" from subdirectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nieder
chec
k
-re
f
-format: handle subcomma
n
ds in se
p
arate funct
i
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu Moy
pretty-optio
n
s
.
txt: m
a
t
c
h --format's
d
o
c
u
mentation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge br
a
nch 's
v
/maint-diff-q-clear-fix' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
M
e
rge branch
'
rr/svn-
f
e' into
m
aint
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o C Hamano
M
e
r
ge branch
'
pt/g
i
t-gui' into
maint
commit
|
commitdiff
|
tree
2010-08-03
Ram
k
umar R
a
mach
a
ndra
contrib/sv
n
-fe: A
d
d the svn
-
fe tar
g
et
to
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Ramku
m
ar Ramachandra
contrib/svn-fe: Fix In
c
l
u
dePath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
un
i
o C Hamano
Mer
g
e br
a
nch 'ab/tap' in
t
o maint
commit
|
commitdiff
|
tree
2010-08-02
Ævar
A
rnfjörð
Bjarm
a
son
t
est-lib: Remove 3 year old no-op --no-p
y
thon option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar
Arnfj
ö
rð
Bjarmason
te
s
t-lib:
I
gn
o
re --quiet under
a TA
P
harness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
i
o C Hamano
Merge
git://rep
o
.
or
.
cz/git-
g
ui into pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thom
a
s Rast
D
ocumen
t
ation/rev-parse: q
u
o
t
i
n
g is req
u
ired with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
unio
C
Hama
n
o
D
o
cumentati
o
n: reporting
bugs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C Ham
a
no
Fix DIFF
_
QUEUE_CLEAR refactorin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Dav
i
d D
.
Kilzer
Fix
git rebas
e
-
-con
t
in
u
e to work with touched fil
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Matt
h
i
e
u
M
oy
D
o
cument
l
s-fi
l
es -t as semi-obsolete
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o C Hamano
Git 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io C Hamano
Sync
with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Git 1
.
7
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Ha
m
ano
Sync with 1
.
7
.
0 seri
e
s
commit
|
commitdiff
|
tree
2010-07-27
Junio C
H
amano
Git 1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Niede
r
c
o
n
f
ig --get --path
:
check
f
o
r
u
nset
$
H
OME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Step
h
en Boyd
commit:
remove f
u
ll stop fr
o
m usage help for -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Mat
t
hi
e
u
Moy
Clarify hel
p
message when n
o
remote
i
s s
p
ecifie
d
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ra
s
t
M
akef
i
l
e
: add check-docs exception for git
r
e
visions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
T
homas Ras
t
Fix
'
git' wr
a
pper usage
string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
T
h
omas Ras
t
D
ocumen
t
ation/g
i
t-push: E
x
plain status
o
utput in
mor
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Doc
u
ment receive
.
den
y
D
e
leteCurrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as Rast
Cast execl*
(
) NULL
s
en
t
inels to
(
char
*
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn Thái
N
gọc
Du
y
git-read
-
t
ree
.
txt:
acknowledge t
h
e di
r
ectory matching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Jon
S
eymour
INSTALL: configure /etc/xml/cat
a
log to build docs
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
hannes Sixt
t3700-add:
f
i
x
dependence
on std
o
ut a
n
d s
t
derr bufferin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Br
a
n
don
C
asey
git-rebase--interactive
.
sh: use
printf instead of
e
cho
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Panike
Ad
d
a googl
e
-chrom
e
o
pti
o
n for web--browse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge b
r
anch
'maint-1
.
7
.
1'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branc
h
'm
a
int-
1
.
7
.
0' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merg
e
branch 'ma
i
nt-1
.
6
.
6'
into ma
i
nt
-
1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
J
unio
C
Hamano
M
erge branch '
m
a
i
nt-1
.
6
.
5' into mai
n
t
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
request-pull
.
tx
t
: Documen
t
-p o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio C Hamano
Merge bra
n
ch 'ma
i
nt-1
.
6
.
4'
i
nto
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Bro
c
kman
Check size of path
b
uff
e
r b
e
for
e
writin
g
into
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Hamano
G
it 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
n
o
test
s
: correct "does reflog
exist?" tes
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t
/
: work
a
round one-
s
hot
varia
b
l
e assig
n
m
ent w
i
th tes
t
_
must_fa
i
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Niede
r
t/READ
M
E: correct an
exception when breaking a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
asey
t/{t5541,lib-
h
t
t
pd}: replace problematic
'
!()' notation
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700: convert two
u
ses
o
f ne
g
atio
n
operat
o
r '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
J
un
i
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon
Casey
t/
R
EADME:
cla
r
ify test_m
u
s
t
_
fail
descriptio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check size of path buffer before
w
riting into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
u
p
d
ate-s
e
rver-info: Shorten read_p
a
c
k_
i
nfo_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
rnfjörð Bjar
m
a
s
on
git add:
A
d
d --i
g
nore-mis
s
ing to
S
YN
O
P
SIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æva
r
A
r
nf
j
örð Bjarmason
git
s
ubmodule add: Rem
o
ve old docs about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
e
n
s Lehmann
gi
t
su
b
modu
l
e ad
d
: Requi
r
e t
h
e new
-
-for
c
e
option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C H
a
ma
n
o
Me
r
g
e
branch 'jl
/
add-n-igno
r
e-mis
s
i
n
g'
commit
|
commitdiff
|
tree
2010-07-19
D
avi
d
Ag
u
ilar
Documentation: Ex
p
la
i
n git-mer
g
e
tool
'
s use of
tempo
r
ary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C
H
amano
Merge br
a
nch 'jc/d
i
ff
-
merge-base-m
u
lti
'
commit
|
commitdiff
|
tree
2010-07-16
Thomas
R
a
s
t
Only r
u
n aggregate-results over actu
a
l count
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Ad
d
a sa
m
ple us
e
r for the
svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jun
i
o C Ham
a
n
o
diff A
.
.
.
B: do no
t
limit
the syn
t
ax
too na
r
r
owly
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io
C H
a
mano
Merg
e
branch 'j
n
/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Merge
b
ra
n
ch
'
wp/m
e
rge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
branch 'js/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ran
c
h '
j
c
/
diff-merge-b
a
se-mult
i
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge
branch '
n
s/merge-re
c
ursiv
e
-
upt
o
dat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Mer
g
e branch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge
branc
h
'eb/doc-lo
g
-ma
n
page'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
M
e
rge b
r
an
c
h 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
M
e
rg
e
b
r
anch 'm
g
/revision-
d
oc'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ham
a
no
Me
r
ge bra
n
ch '
j
k
/
maint-statu
s
-keep-
i
ndex
-
times
t
a
m
p'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
m
a
n
o
Merge br
a
nch 'jc/rebase-i-c
o
mmit-msg-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ha
m
ano
Me
r
g
e branch 'ab/subm
o
d
u
le-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'bc/
m
aint-ma
k
efile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
man
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
N
ieder
Do
c
u
m
entation: add submodule
.
*
to the big confi
g
u
r
at
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitmodules
.
5: url ca
n
be a rela
t
ive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Pavan
K
umar Sunkara
gitweb: fix esc_url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jon
a
th
a
n Nieder
git --
p
agin
a
te: p
a
ginate
ext
e
rnal
commands again
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Jay
So
f
fian
M
E
RG
E
_
R
R i
s
in
.
git, n
o
t
.
git/rr-cache
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Pal
m
e
r
merge-
t
ree:
f
i
x wh
e
r
e two branches share no
c
h
anges
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
add basic tests for
m
erge-tr
e
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-14
J
un
i
o C
Hamano
G
it 1
.
7
.
2-r
c
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next