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
cmd_merge(): Parse options before checking MERGE_HEAD
2010-11-17
Johan Herland
cmd_merge(
)
: Pa
r
s
e o
p
tions
b
efo
r
e checking MERGE_HEAD
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
han Herland
Provide '
g
it
n
otes get-ref' to easi
l
y re
t
rieve current
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rl
a
nd
git notes merge:
A
dd testca
s
es
for merging
n
ot
e
s
tr
e
es
.
.
.
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 Herla
n
d
gi
t
notes merge: Ad
d
another auto-resolving strategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
git
notes merge: --commi
t
sh
o
uld fail if underlying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge: List conflicting no
t
es in notes merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
notes m
e
rge: Manu
a
l conflict re
s
olution, part 2
/
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
git notes merge
:
Ma
n
ual co
n
flict resolution, part 1/2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
Docume
n
tation
:
Preliminar
y
doc
s
on 'g
i
t notes
m
e
rge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
a
n Herland
git notes merg
e
:
Ad
d
a
ut
o
matic conflict resol
v
e
r
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
git n
o
te
s
me
r
ge:
H
a
ndle real,
n
on-c
o
nf
l
icting notes
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
builtin/
n
otes
.
c: R
e
factor
c
reation of notes comm
i
ts
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
i
t
note
s
merge: In
i
t
i
a
l
implementation handling
t
rivial
.
.
.
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/n
o
tes
.
c: Split notes ref DWIMmery into a separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
t
es
.
c
: Use t
w
o newli
n
es (instead of one)
when c
o
n
c
atenatin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herland
(
trivial) t3
3
03: Indent
with tabs instead o
f
spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
n
o
tes
.
h/c
:
Prop
a
g
a
te combine_n
o
tes_fn
r
eturn value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
H
erland
n
o
tes
.
h/c:
A
l
low combin
e
_
n
o
t
e
s
f
unctions to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
c
:
Re
o
rder functi
o
n
s i
n
preparation for next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
:
Mak
e
default_not
e
s_ref() availa
b
le in
notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Herland
(t
r
ivial)
n
otes
.
h: Mi
n
or do
c
um
e
nt
a
tio
n
f
i
xes t
o
c
o
py
_
notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Hexify SHA1 in die() message fr
o
m init_not
e
s()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René S
c
harfe
notes: allow --dry-
r
un for -n and --verb
o
se for
-v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matthieu Moy
Docu
m
e
n
t -B<n>[/<m>], -
M
<n> a
n
d -C<n> vari
a
nt
s
of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Bra
d
King
Doc
u
mentation: cit
e
git-am from git-ap
p
ly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Th
o
m
a
s Rast
t
70
0
3
: fi
x
subdirectory-filter tes
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an
Nieder
Allow "check-
r
ef-format --bra
n
ch" from subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
h
an N
i
eder
check-re
f
-format: ha
n
d
le subcommands in s
e
p
a
rate functi
o
ns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Ma
t
thieu Moy
pretty-options
.
txt: match --forma
t
's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio
C Hamano
Merge bran
c
h 'sv/maint-diff-q-
c
lear-fi
x
' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge branch 'rr/svn-fe'
into maint
commit
|
commitdiff
|
tree
2010-08-03
Ju
n
io
C
Hamano
Merge bran
c
h
'pt/git-gui' into
m
aint
commit
|
commitdiff
|
tree
2010-08-03
Ramkuma
r
R
a
m
achandra
contrib/
s
vn-fe: Add
t
he svn-fe target
to
.
gitign
o
re
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
R
amkumar Ra
m
achandra
contrib/svn-fe: Fix IncludePat
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Haman
o
Merge branch 'ab/tap'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnf
j
örð Bja
r
mason
te
s
t-lib: Remove
3
y
e
ar old no-op --no
-
python option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Æ
v
a
r Arnfjörð B
j
ar
m
ason
test-lib: Ignore
-
-quiet un
d
er 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
g
it://
r
epo
.
or
.
cz/git-gui into pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
T
homas
R
ast
Documenta
t
ion/rev-parse: quoting is required wit
h
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
io C Hamano
D
ocumentation: repor
t
ing bug
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Fix DIFF_
Q
UEUE_CL
E
AR refa
c
toring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
D
avid D
.
Ki
l
ze
r
Fix g
i
t rebase --cont
i
nue t
o
work with touched fi
l
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Docu
m
ent ls-files -t as semi
-
obso
l
ete
.
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
Jun
i
o C Hamano
Sync
wit
h
1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio
C
Hama
n
o
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
Sy
n
c
w
ith 1
.
7
.
0
series
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Git 1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan N
i
e
d
er
config --get
-
-p
a
th: check for unset $
H
OME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
S
t
ephen Boyd
c
o
mmit: remove full
s
top f
r
om
usage
help for
-
u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Ma
t
th
i
eu Mo
y
Clarify help m
e
s
sage
w
hen
n
o remote is sp
e
c
ified in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ras
t
Mak
e
fil
e
: add check-docs exception
f
o
r
gitrevisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Fix
'git' wra
p
pe
r
usage str
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Docu
m
en
t
ation/git-p
u
sh: Ex
p
l
ain
s
ta
t
us output in
m
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Ras
t
Docu
m
ent r
e
cei
v
e
.
denyDe
l
et
e
Curr
e
nt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast
e
xecl*() N
U
LL sent
i
nels to (char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn Thái N
g
ọc Duy
gi
t
-read-tree
.
txt: acknow
l
e
d
ge the director
y
matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
n
Seymour
INSTALL:
c
onfigu
r
e /etc/xml
/
catalog to buil
d
do
c
s
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Johann
e
s Sixt
t3
7
00-add: fix d
e
pendence
o
n
stdout an
d
stderr buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Casey
git-reba
s
e--interactive
.
sh: use
pr
i
ntf instead o
f
e
c
ho
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Panike
A
d
d a google-chrome op
t
ion for web--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio
C
Hamano
Merge branch 'maint-1
.
7
.
1'
i
n
t
o
m
a
int
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C Hamano
Merge br
a
nch 'maint-1
.
7
.
0' i
n
to maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o
C
H
a
mano
Merge bran
c
h 'maint-1
.
6
.
6' into
m
aint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch
'
maint-1
.
6
.
5' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
re
q
u
est-
p
ull
.
tx
t
: Document -p option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C H
a
mano
Merg
e
branch '
m
ai
n
t
-
1
.
6
.
4' into maint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Br
o
ckman
Check size o
f
path buffer b
e
fo
r
e w
r
iting into
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io
C Hamano
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C
H
a
m
ano
tests
:
correct "does reflog
exist?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brand
o
n Casey
t/: wo
r
k
ar
o
und on
e
-shot v
a
riable assignment with test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
N
i
e
der
t/README: corr
e
ct an exception
w
hen breaking a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon Case
y
t
/
{t5541,lib
-
httpd}:
r
ep
l
a
ce prob
l
emati
c
'!()' n
o
tation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brand
o
n Case
y
t/t37
0
0: conv
e
rt tw
o
uses of n
e
gat
i
o
n
o
p
e
rato
r
'
!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon
C
a
sey
t/README:
c
larify test_must_fail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Br
o
ckman
C
h
eck size of path buffe
r
before writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Ha
m
ano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upd
a
t
e
-se
r
v
e
r-info
:
Shorten read
_
pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmas
o
n
git
a
dd: Add
--igno
r
e
-
m
i
s
s
in
g
t
o
SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmas
o
n
gi
t
submodu
l
e add: Remove
o
ld docs
a
b
o
ut i
m
pl
i
cit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
git submodule add:
Requ
i
re
t
h
e
n
ew --force o
p
t
i
on to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
unio
C
Ha
m
ano
Merge br
a
nch '
j
l/add-n-ignor
e
-miss
i
n
g
'
commit
|
commitdiff
|
tree
2010-07-19
David Aguila
r
D
o
cumentation: Expl
a
in git
-
mergetool's u
s
e
of te
m
porar
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Ham
a
no
Mer
g
e
b
r
anch 'jc
/
diff
-
m
erge
-
base-mult
i
'
commit
|
commitdiff
|
tree
2010-07-16
Thomas
Rast
Only run aggregate-results over actu
a
l coun
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
onathan Nieder
Ad
d
a sam
p
l
e
user f
o
r the svn
d
u
m
p
library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
diff A
.
.
.
B: d
o
not l
i
mit
th
e
syntax
t
oo narrowly
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge bra
n
ch 'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merg
e
bra
n
ch '
w
p
/
merg
e
-tree
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
io C
H
amano
M
e
rge branc
h
'js/mer
g
e-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch
'jc/diff-merge-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch '
n
s/m
e
rge-re
c
urs
i
ve-uptodat
e
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
Ham
a
n
o
Merge b
r
a
nc
h
'
j
n/tests
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'eb/doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge branch 'jn/g
r
ep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
r
ge
b
ranch 'mg/rev
i
sion-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hama
n
o
Mer
g
e
branc
h
'jk
/
maint-statu
s
-keep-index-t
i
mestamp'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch 'jc/rebase-i-
c
ommit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Hamano
Mer
g
e branch
'
ab/submodule-add-f'
commit
|
commitdiff
|
tree
next