repo.or.cz
/
git
/
mingw
/
j6t.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: Preliminary docs on 'git notes merge'
2010-11-17
Johan Herla
n
d
Documentation: Preliminary d
o
cs on
'
git notes
m
e
r
g
e
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
H
e
rland
g
i
t notes merge: Add automatic c
o
nflict r
e
solvers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n
Herland
git
notes merge
:
Hand
l
e
r
e
al
,
non-conflictin
g
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
u
iltin/notes
.
c: Refactor creation of no
t
es commi
t
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Her
l
and
git notes merge
:
Initial implementation h
a
n
dling t
r
ivial
.
.
.
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: Split
n
otes ref DWIMmery into
a
se
p
arate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han He
r
land
n
o
tes
.
c: Use
t
wo n
e
w
l
ines (
i
n
s
tead of one) when concatenatin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
land
(t
r
ivia
l
) t3303: Indent
w
i
th ta
b
s 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
: Propagat
e
combine_notes_f
n
return valu
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
ohan Herlan
d
notes
.
h
/
c:
All
o
w combine
_
notes
functions to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan H
e
r
l
an
d
n
otes
.
c: Re
o
rder functions in pr
e
paration fo
r
next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n Herland
notes
.
h: Make def
a
u
l
t
_not
e
s
_
ref() available in notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
(t
r
i
vial) notes
.
h: Min
o
r documen
t
ati
o
n fixes to co
p
y_notes
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
c: Hexify SHA1 i
n
die()
mess
a
ge f
r
om
i
nit_notes(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René Sc
h
arfe
notes:
allow --d
r
y-ru
n
f
o
r -n an
d
--verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matth
i
e
u
Moy
D
o
cumen
t
-B<n>[/<m>], -M<n> and
-
C
<n>
v
ariants o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
Documentation: cite
g
it-am from git-app
l
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
T
h
o
m
as Rast
t7003: fix subdir
e
ctory-fil
t
er
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
a
t
h
a
n
N
i
eder
Allow "check-re
f
-format --branch" from subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonath
a
n Nieder
c
h
eck-ref-forma
t
: han
d
le subcommands in
s
epar
a
te functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu Moy
p
retty-opt
i
ons
.
txt:
m
a
tch --fo
r
m
a
t's doc
u
ment
a
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge
branch 'sv/mai
n
t
-d
i
ff-q
-
c
l
e
ar-fix' into maint
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o C Ham
a
no
Merge branch 'rr/svn-fe' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Ham
a
n
o
Me
r
ge
branch 'pt/git-gu
i
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
Ramku
m
ar
R
a
macha
n
dra
contrib/svn
-
fe: Add the svn-
f
e target to
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramk
u
mar Rama
c
han
d
ra
contr
i
b/svn-f
e
: Fix IncludePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
H
amano
Merge br
a
nch 'ab/
t
ap'
into maint
commit
|
commitdiff
|
tree
2010-08-02
Æ
v
ar Arnfjörð Bjarma
s
on
test-l
i
b:
Remove
3 year old no-op --no-p
y
tho
n
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjörð Bjarmas
o
n
test-li
b
: Igno
r
e --quiet under a
T
AP harne
s
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C
Ha
m
an
o
Merge git://repo
.
or
.
cz/git-gui into pt/gi
t
-gui
commit
|
commitdiff
|
tree
2010-08-02
Th
o
mas Ras
t
Docum
e
ntatio
n
/rev-parse: quoting
i
s re
q
uired with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
io C
Hama
n
o
Document
a
tion: rep
o
rting bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C
Hamano
Fi
x
D
IFF_QUEUE_CLEAR refa
c
toring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
D
avid D
.
K
i
lzer
Fix git rebase --continue to wo
r
k with touche
d
f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthie
u
Moy
Document ls-fi
l
es -t as
se
m
i-obso
l
ete
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o
C H
a
m
a
no
G
it 1
.
7
.
2
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
J
u
nio C Hamano
S
yn
c
with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Ju
n
i
o 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
an
o
Sync with
1
.
7
.
0
ser
i
es
commit
|
commitdiff
|
tree
2010-07-27
Junio C
Hamano
G
i
t
1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
athan Ni
e
der
config
--get --
p
ath: check for unse
t
$HOM
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephen
B
oyd
c
ommit: remove full stop
f
rom u
s
ag
e
help for -u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu Moy
Clarify help message when no
r
emote is
specifi
e
d in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
T
homas Ra
s
t
Makef
i
le:
a
dd che
c
k-d
o
cs exception for gitrevisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Ra
s
t
F
ix 'git' wrap
p
er usag
e
string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thoma
s
Rast
Docume
n
tati
o
n/git-push
:
Explain
s
tatus ou
t
put in
m
ore
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Ra
s
t
Do
c
ument receive
.
d
enyD
e
l
eteCurrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas
Rast
Cast execl*() NUL
L
sentinels 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
git-r
e
ad-
t
re
e
.
txt: a
c
knowledg
e
the di
r
ector
y
matchin
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jon Seymour
INSTALL:
c
o
nfigure /et
c
/xml/catalog
to build d
o
c
s
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
han
n
e
s
S
ixt
t3700-add
:
fix dependence on s
t
dout an
d
stderr bufferi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Bra
n
d
o
n Ca
s
ey
git-rebas
e
--in
t
eract
i
ve
.
sh: u
s
e p
r
intf in
s
tead of ec
h
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Panike
Add a google
-
c
h
rome optio
n
f
or web--brows
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
unio
C
Ha
m
ano
M
e
rge
b
r
a
nch 'maint-1
.
7
.
1
'
into m
a
int
commit
|
commitdiff
|
tree
2010-07-26
Junio C Ham
a
no
Merge
b
ranch 'ma
i
nt
-
1
.
7
.
0' i
n
to
maint-
1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge
b
ranch 'maint-1
.
6
.
6'
i
n
t
o maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Hamano
Mer
g
e branch 'maint
-
1
.
6
.
5
'
in
t
o
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
r
eq
u
est-pull
.
txt
:
Document
-p option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
M
erge bra
n
ch '
m
aint
-
1
.
6
.
4' into
m
aint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
G
r
eg Brockman
Check size of path buffer
be
f
ore writ
i
ng i
n
to it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
J
u
nio C Hamano
G
it 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Juni
o
C Ham
a
no
tests: c
o
rrect "d
o
es
r
eflog exist?" t
e
s
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Bran
d
on
Casey
t/: w
o
rk a
r
ound one
-
s
hot
v
a
r
iable
a
s
s
ignment with test_mus
t
_
f
ail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jo
n
a
t
han
N
ieder
t/README: correct an exception
w
hen breaking a &&
chai
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Br
a
ndon Casey
t/{t5541,li
b
-h
t
tpd}: repla
c
e problematic '!()' notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3
7
00: convert t
w
o uses of
n
e
g
a
tion operator '
!
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Ju
n
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/RE
A
DME: clarify te
s
t_must
_
fail de
s
crip
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg
Brockman
Ch
e
ck si
z
e of path buff
e
r before wr
i
ting int
o
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
Hamano
M
e
rge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-07-19
R
a
l
f Thielow
up
d
a
t
e-server-info:
S
h
o
r
t
e
n read_pack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarma
s
on
git
a
dd: Add
--igno
r
e
-missing to
SYNOP
S
IS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
A
r
n
fj
ö
r
ð
Bjarmason
git submo
d
ule add: Remove old docs about
implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehmann
g
i
t submo
d
ule add: Require
the new --
f
o
r
ce opti
o
n
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C
H
a
m
ano
Merge bra
n
ch 'jl/add-n-igno
r
e-missi
n
g'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Docum
e
n
t
ation:
E
xpla
i
n git-mergetool
'
s
use o
f
tempor
a
ry
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Mer
g
e branch 'jc/
d
iff-merg
e
-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
T
h
omas Ras
t
Only r
u
n aggrega
t
e-resu
l
t
s over actual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
Nieder
A
d
d a sample user for the svndu
m
p library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
Ha
m
ano
diff A
.
.
.
B:
d
o not
l
imit the synt
a
x too narrowly
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Me
r
ge br
a
nch 'j
n
/pa
g
i
na
t
e
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Ha
m
ano
Merge b
r
a
nch 'w
p
/
merge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C Ham
a
no
Merg
e
bran
c
h 'js/
m
erge-rr-f
i
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hama
n
o
Merge branch 'jc/diff
-
m
erge-bas
e
-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
erge bran
c
h 'ns/merge-recursive-
u
ptodate'
commit
|
commitdiff
|
tree
2010-07-15
J
un
i
o
C
Hamano
Merge branch 'jn
/
tests
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch
'
eb
/
doc-log-manpage'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Me
r
ge branch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge branch 'mg/r
e
vision-doc'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Ha
m
ano
Merge bran
c
h
'jk/maint-st
a
tus-keep-index-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jc/re
b
ase-i-co
m
mit
-
msg-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
n
o
Mer
g
e bra
n
ch 'a
b
/submodul
e
-ad
d
-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Me
r
ge branch
'bc/maint
-
makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
man
o
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan
Nied
e
r
Docume
n
t
ation:
add submodul
e
.
* to the b
i
g
c
o
nfiguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonath
a
n Nieder
g
itmodules
.
5: url can be a rela
t
ive
pat
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan K
u
mar Sunk
a
ra
gitw
e
b
: fi
x
es
c
_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
onathan Ni
e
der
git --pag
i
n
ate: paginate
e
xter
n
al comma
n
ds agai
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay So
f
fian
M
ERGE_RR is i
n
.
g
i
t, not
.
git/r
r
-
c
ache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palmer
merge-tre
e
: f
i
x where
t
wo branche
s
share
no chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next