repo.or.cz
/
git
/
git-svn.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: --commit should fail if underlying notes ref has moved
2010-11-17
Johan
Herland
git
notes merge: --commit should fail if underlying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herla
n
d
g
i
t n
o
tes merge: Lis
t
confl
i
c
ting
n
o
t
es in notes merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Manual conf
l
ict resolution,
p
art 2/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Her
l
and
git notes mer
g
e
: Manual co
n
flict resolution, p
a
rt 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
a
n H
e
rland
Document
a
tion: Prel
i
m
i
nary docs
o
n 'g
i
t n
o
tes merge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes merg
e
: Add a
u
t
o
matic
con
f
l
i
c
t
r
eso
l
vers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git note
s
merge
:
H
a
ndle real, non-conflict
i
ng n
o
tes
.
.
.
-
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
Joh
a
n H
e
rland
bui
l
tin/notes
.
c: Refac
t
or
c
re
a
tion
of notes commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes merge: Initi
a
l
i
m
plemen
t
ation 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 Her
l
a
n
d
b
uiltin/notes
.
c
: Spli
t
notes ref DWIMm
e
ry into a separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
lan
d
notes
.
c: Use two n
e
wlines
(instead of one) w
h
en conc
a
tenatin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(
trivial)
t
33
0
3: Indent with tabs instead of
s
paces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
notes
.
h/c: Pr
o
pagate
c
ombine_n
o
te
s
_fn return
v
a
lue
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan
H
erland
notes
.
h/c: Allow combine
_
n
ot
e
s functions t
o
re
m
ove
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
notes
.
c:
Reorder functions in prep
a
ration
f
or n
e
xt
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Her
l
and
n
o
tes
.
h: Make de
f
ault_no
t
es_ref() availabl
e
in notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han He
r
la
n
d
(trivial) notes
.
h: Minor docum
e
ntation fixes to copy_no
t
e
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexi
f
y SHA1 in die
(
)
m
ess
a
ge fr
o
m init_
n
otes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
René Sch
a
rfe
n
o
tes: allo
w
--dry
-
run
f
or -n and --verbo
s
e
f
or -v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
M
a
t
t
h
i
eu M
o
y
Do
c
u
m
ent -B<n>[/<m>], -M<n> and -C
<
n
>
varia
n
t
s
of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad
K
i
ng
D
ocumentatio
n
:
c
i
t
e
g
i
t-am from
g
i
t
-
apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
T
homa
s
Rast
t7003: fix su
b
d
ir
e
ctory-filter tes
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n
Nieder
Al
l
ow "check-re
f
-
forma
t
--branch" from s
u
bdi
r
ectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nieder
check-ref-format: hand
l
e subcommands
i
n
s
eparate functio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu Mo
y
pretty-o
p
tio
n
s
.
txt: match --
f
ormat's documentati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio
C
Ham
a
no
Merge br
a
nch 'sv/maint-
d
iff-q-clear-fix' into maint
commit
|
commitdiff
|
tree
2010-08-03
J
unio C H
a
ma
n
o
Merge branch 'rr/svn-fe' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio
C
Hamano
Merg
e
bra
n
ch
'
pt/git-
g
ui'
into maint
commit
|
commitdiff
|
tree
2010-08-03
Ram
k
umar
R
amachandra
contrib/svn-fe
:
Add the svn-fe target to
.
gitig
n
o
re
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Ra
m
k
u
mar Ramachandra
c
o
n
trib/s
v
n-fe: F
i
x I
n
cludePath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C Hamano
Merge branch 'ab/tap' int
o
maint
commit
|
commitdiff
|
tree
2010-08-02
Æ
v
ar Arn
f
j
ö
r
ð Bjarmason
test-
l
ib: Remo
v
e
3
y
e
ar old
n
o-op
--no-python op
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarm
a
son
test-lib: Ignore
-
-quiet u
n
der
a TAP harness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
unio
C Hamano
Merge git://repo
.
or
.
cz/
g
it-gui into pt/git
-
gui
commit
|
commitdiff
|
tree
2010-08-02
T
homas Ras
t
Doc
u
mentation/
r
ev-pa
r
se: quoting is r
e
qu
i
red
w
ith
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
io C Hamano
Documentation: reporti
n
g
b
u
g
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio C Ha
m
ano
Fix DIFF_QUEUE_
C
LEAR refactorin
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Dav
i
d
D
.
Kilzer
Fix git reb
a
se
-
-continue to
work with tou
c
hed files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Ma
t
thi
e
u Moy
Docu
m
ent ls-
f
iles
-t as semi-o
b
solete
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Git 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Sync with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio
C
Ha
m
ano
Git 1
.
7
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
io C Hamano
Sync with 1
.
7
.
0
seri
e
s
commit
|
commitdiff
|
tree
2010-07-27
Juni
o
C
Haman
o
G
i
t 1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
J
onathan Nieder
config --get --path
:
chec
k
for unset $HOME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Stephen B
o
yd
co
m
m
it
:
r
emove full stop from usage help for -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu Moy
Clarify help messa
g
e when no remo
t
e
is specified in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Th
o
mas
R
a
st
Makefile:
a
dd check
-
docs excepti
o
n
for gitrevisions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Fix
'
git' wrapper usage string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
D
o
cum
e
n
tation/git-pu
s
h: Explain
s
tatus output in
more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thom
a
s
R
ast
Document receive
.
de
n
y
D
eleteCurrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Ca
s
t e
x
ec
l
*() NULL sentin
e
l
s t
o
(
c
har *)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn Thái N
g
ọc Duy
git-read-tree
.
t
x
t:
a
cknowl
e
dge the d
i
rectory
m
a
tching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
on
S
eymour
INSTALL: configure /etc/xm
l
/catalog to bui
l
d
d
o
cs on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Johann
e
s
S
ixt
t
3
700-ad
d
: fi
x
d
e
p
endence on stdout and stderr b
u
ffer
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Brand
o
n Case
y
git-rebase--interactive
.
s
h
: u
s
e print
f
instead of e
c
ho
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
N
a
t
han W
.
Panike
Add a google
-
chrome
o
ption f
o
r web
-
-browse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C Hamano
Mer
g
e branc
h
'maint-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-07-26
Junio C H
a
mano
Merge
b
ranch 'maint-1
.
7
.
0' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C Hamano
Merge branch 'maint-1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch 'maint-
1
.
6
.
5'
i
nto
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
req
u
est-pull
.
tx
t
:
D
o
cument -p option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hama
n
o
Merge
b
r
anch 'm
a
in
t
-1
.
6
.
4
'
i
n
to maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
Check size of pat
h
b
u
ffer bef
o
re
w
riti
n
g into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
Hamano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
J
u
n
i
o C Hamano
tests
:
correct "d
o
es reflo
g
exist?"
tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
ndon Casey
t/: work aro
u
nd
o
ne-sh
o
t v
a
riab
l
e
assignment with test_mu
s
t
_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonath
a
n N
i
eder
t
/
REA
D
ME:
co
r
r
ect an exceptio
n
whe
n
bre
a
ki
n
g a && ch
a
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,lib-ht
t
pd
}
: r
e
pla
c
e problema
t
ic '!(
)
'
not
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
as
e
y
t/t3700: convert tw
o
uses
o
f negation operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Juni
o
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-07-20
Br
a
nd
o
n Ca
s
ey
t
/
REA
D
M
E
: clari
f
y test_must_fail descrip
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Gr
e
g Brockman
C
h
eck size of path buffer before writing
into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ral
f
T
hielow
upda
t
e-server-info:
S
h
orten read_pack_info_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git add: Add
--
i
gn
o
re-missin
g
to S
Y
NOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Ar
n
fjörð Bjarmason
git su
b
module add:
R
e
move old docs about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submo
d
ule add: R
e
q
u
i
re
the new
-
-for
c
e o
p
tion
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io C Hamano
Merge
b
ranch 'jl/add-
n
-ign
o
re-m
i
ss
i
ng'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
cumenta
t
ion: Explai
n
git
-
mergetool's use of tempo
r
ary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Ju
n
io C Hamano
Merge branch 'jc/
d
iff-merge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Tho
m
as Rast
Only run aggrega
t
e-res
u
lts o
v
er actual counts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add a sampl
e
user
f
or
t
h
e svndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Juni
o
C Haman
o
diff A
.
.
.
B: do not
l
imit t
h
e syntax too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C
Ha
m
a
n
o
Merge branch 'jn/
p
a
g
i
n
a
t
e
-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge
b
ranch 'wp/merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch '
j
s/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
r
g
e branch '
j
c/dif
f
-merge-base
-
multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge
branch 'ns
/
merge-
r
ec
u
rsive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hama
n
o
Merge bra
n
ch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Me
r
ge branc
h
'
eb
/
d
oc-
l
og-ma
n
page'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge br
a
n
ch 'jn/g
r
ep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch 'm
g
/revi
s
ion-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Hamano
Mer
g
e branch 'j
k
/maint-
s
tatu
s
-keep-index-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
erge b
r
an
c
h 'jc/r
e
bas
e
-i-co
m
mit-
m
s
g
-
fix
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
a
mano
M
e
rge
bran
c
h 'ab/su
b
m
o
dule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
g
e
bra
n
ch 'bc/maint-
m
akefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Ha
m
an
o
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation
:
a
d
d submod
u
le
.
* to th
e
big con
f
iguratio
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Niede
r
g
itmodules
.
5: url can be a rel
a
tive path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next