repo.or.cz
/
git
/
dscho.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: Add testcases for merging notes trees at different fanouts
2010-11-17
Johan
H
er
l
and
git
notes m
e
rge
:
Add testcases fo
r
merging
n
otes trees
.
.
.
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
H
e
rlan
d
g
it notes m
e
rge:
Ad
d
an
o
ther
a
u
t
o
-resolving
s
t
rategy
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
git notes merge:
--commit s
h
ould f
a
il if underlying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
erland
gi
t
notes merge: L
i
st con
f
lictin
g
notes in notes
merge
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
an
d
gi
t
notes mer
g
e: Manual con
f
li
c
t resolution,
p
art
2/
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
g
it notes merge
:
Manual conflict resolution, p
a
rt 1
/
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Documentatio
n
: Preliminary
d
oc
s
on 'git
notes merge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it notes m
e
r
ge: Add automatic conflict resolvers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
nd
gi
t
notes
m
e
r
g
e: Handle real, non-conf
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 Herland
b
uiltin/notes
.
c
:
Refactor c
r
e
ation of
n
o
t
es co
m
mits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git no
t
es merge: Initial impleme
n
tation handling trivial
.
.
.
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
r
land
bu
i
ltin/notes
.
c: Split notes
r
ef
D
WIM
m
e
ry
into a separa
t
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Jo
h
an Herland
notes
.
c: Use two
n
ewlines (instead of one) when concatenat
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
(triv
i
al) t330
3
: Ind
e
n
t
with tabs instead
o
f
spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
notes
.
h/c: Pr
o
pa
g
ate c
o
mb
i
ne_notes_fn return val
u
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h/c: Allow com
b
i
n
e_
n
otes functions to
remov
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
c: Reorder functions in preparati
o
n f
o
r next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herland
notes
.
h: Make defa
u
l
t_notes_ref
(
) avai
l
abl
e
in notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
rla
n
d
(
t
rivial) notes
.
h:
Minor documentation fixes
to copy_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an H
e
rland
n
otes
.
c: Hexify SHA1 in
d
ie() mes
s
a
ge from i
n
it_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René
S
charfe
no
t
e
s
: a
l
low
--d
r
y-run for
-n and
-
-
verbo
s
e for
-
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
M
a
t
t
hieu M
o
y
Docume
n
t -B<n
>
[/<m>], -M<n> and -C<
n
> variants of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
D
o
cumentat
i
on: cite g
i
t-am
from git-appl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas
R
ast
t7003
:
fix su
b
directory-
f
ilte
r
t
est
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonat
h
an Nieder
Allow "check-ref-forma
t
--branch"
from subdir
e
ctory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
er
check-r
e
f-format: handle sub
c
ommands in separate func
t
i
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Ma
t
thieu Moy
pretty-opti
o
ns
.
txt:
m
a
t
ch --format's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio
C Hamano
Merge branch '
s
v
/maint-diff-q-clear-fix' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Mer
g
e b
r
anch
'rr/svn-fe' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge branch 'pt/
g
it-gui' into maint
commit
|
commitdiff
|
tree
2010-08-03
Ramk
u
mar Ramachandra
contrib/svn-
f
e: Add
the svn
-
fe tar
g
e
t
to
.
gitigno
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar Ramachandra
co
n
trib/svn-fe:
Fix Include
P
ath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o C Hamano
Mer
g
e
b
ranch
'a
b
/ta
p
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-02
Ævar
A
rnfjörð Bjarmas
o
n
test-lib: Remove 3 year old no-op --no-pyt
h
on option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð B
j
a
r
mason
test-lib: Ignore --quiet under a
TAP harness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio
C
Hamano
Merge g
i
t://rep
o
.
or
.
cz/gi
t
-gui into pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Th
o
m
a
s Rast
Docume
n
tation/re
v
-parse
:
qu
o
t
i
ng is required with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
Hama
n
o
Docum
e
n
t
ation:
r
eporting bug
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C Hamano
Fix DIFF_Q
U
E
U
E
_
CLEAR r
e
factori
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
F
ix git
r
ebase --continue to work with touched files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthi
e
u Moy
Document ls-files
-
t
as
semi-obsolete
.
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
Junio C Hamano
S
y
nc with
1
.
7
.
0 series
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 Nieder
config --get --path: chec
k
for
unse
t
$HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephen Boyd
commit
:
remove fu
l
l stop fro
m
usage
h
e
lp for -
u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matt
h
i
e
u Moy
Cla
r
ify help message wh
e
n
no
r
e
mote is specified in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefile: add ch
e
ck-doc
s
exception for gitre
v
isions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ra
s
t
F
i
x 'g
i
t'
wrapper us
a
ge stri
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
h
omas
Rast
Do
c
umentation/gi
t
-pus
h
: Explai
n
st
a
t
us outpu
t
i
n more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Doc
u
m
ent
r
e
ceive
.
denyDeleteCurrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
hom
a
s Rast
Cast execl*() NULL sentinels t
o
(
char *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nguyễn
Thái Ngọc Duy
git
-
read-tree
.
txt:
acknowledge the directory matching
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jo
n
Seymour
INST
A
LL: configu
r
e /etc/xml/cata
l
og to build docs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Johannes Sixt
t
3700-
a
dd: fix
d
ep
e
n
d
ence on std
o
u
t
and stderr b
u
ffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Bran
d
o
n
Casey
git-rebase
-
-
i
n
te
r
activ
e
.
sh: use prin
t
f instead o
f
echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
P
a
nike
A
d
d a g
o
o
g
le-chrome option for web
-
-b
r
owse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C Hamano
M
e
rge bran
c
h 'main
t
-1
.
7
.
1' into m
a
int
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
amano
Merge branch
'
main
t
-1
.
7
.
0
' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C Haman
o
M
e
rge branch 'ma
i
nt-
1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
M
erge
branch 'maint-1
.
6
.
5' int
o
maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
request-pul
l
.
txt: Docum
e
nt -p opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
a
man
o
Merge
branch 'maint-1
.
6
.
4' into maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Gre
g
Br
o
c
k
m
an
Check
size of path buffer before 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
J
u
ni
o
C
H
amano
t
e
sts
:
correct "doe
s
r
e
flog ex
i
s
t
?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brand
o
n
C
ase
y
t/: wo
r
k
around one-shot variable assignment with
t
e
st_
m
ust_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
o
na
t
han Nie
d
er
t/README: correc
t
an excepti
o
n when b
r
eaking a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541,
l
ib-http
d
}: repla
c
e problema
t
ic '!()' notatio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Bran
d
on Cas
e
y
t
/
t
370
0
: convert
t
wo
us
e
s
of nega
t
ion operator '!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Jun
i
o
C H
a
man
o
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Casey
t/README:
c
l
arify test_
m
ust_fail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Gre
g
Br
o
ckm
a
n
Check
size o
f
pat
h
b
u
f
f
er
b
e
fo
r
e writing into i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge bra
n
ch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
update-
s
erver
-
info: Shorten read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
a
r
Ar
n
f
j
ö
rð Bjarmason
git add: Add
--ignore-
m
issing to
S
YN
O
PSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
gi
t
submodule ad
d
: Remo
v
e old docs ab
o
ut implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
g
it s
u
bmodule add: Requir
e
the new --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hama
n
o
Merg
e
branch 'jl/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
D
av
i
d Ag
u
ilar
Docu
m
entation: Expl
a
in
gi
t
-me
r
getool's
u
se of temp
o
r
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Ha
m
ano
M
er
g
e branch 'j
c
/diff-
m
erge
-
base-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
h
o
m
a
s
Rast
Only run
a
ggregate-results over actu
a
l
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
onathan Nieder
Add a sample u
s
er fo
r
the
svndump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
u
n
io
C Hamano
diff A
.
.
.
B
:
do not limit the synt
a
x t
o
o narrowly
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
ama
n
o
Merge
b
ran
c
h
'jn/pagi
n
ate-fix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Merge branch '
w
p
/merge
-
tr
e
e-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
a
n
ch 'js/merge-rr
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Hamano
Merge bra
n
c
h 'jc/diff-merge-ba
s
e
-
multi'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o
C Hamano
Merge branch 'ns/merge-re
c
ursi
v
e-uptoda
t
e'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ha
m
ano
Mer
g
e b
r
an
c
h '
j
n
/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch 'eb/doc-log-manpag
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge bran
c
h
'
j
n/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'm
g
/re
v
ision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ha
m
ano
Me
r
ge branch 'jk/mai
n
t-status-keep-i
n
dex-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
a
no
Merge branch
'jc/reb
a
se
-
i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Ham
a
no
Merge bra
n
ch '
a
b/sub
m
odule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
Hamano
Merge
branc
h
'bc/maint-makefile-
f
ixes
'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next