repo.or.cz
/
alt-git.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 He
r
land
Do
c
umentation: Preliminary docs
on
'
git note
s
me
r
ge'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erla
n
d
g
it notes merge: Add autom
a
tic conf
l
ict
reso
l
vers
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git no
t
es m
e
r
ge: Han
d
le real, non-c
o
nflicting 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/notes
.
c: Refactor creation of notes
c
ommits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
git notes merge: Initial implementation 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
erland
builtin/notes
.
c:
S
plit
n
o
t
es ref D
W
IMmer
y
into a
separat
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
Herland
notes
.
c
:
U
s
e tw
o
newl
i
n
es (inst
e
a
d
o
f
one) wh
e
n concate
n
at
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan He
r
l
and
(
t
r
i
vial) t3303: Inde
n
t wit
h
tab
s
instead of space
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rl
a
nd
notes
.
h/c: Propagat
e
combine
_
notes
_
fn re
t
urn value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
H
erland
no
t
es
.
h/
c
:
Allow
co
m
bine_no
t
es
functi
o
ns
to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n
Herland
notes
.
c: Reorder fun
c
t
i
on
s
in preparation for
next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
notes
.
h
: Ma
k
e d
e
fault_note
s
_ref() available
i
n notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
an Herl
a
nd
(t
r
ivial)
n
otes
.
h
:
Minor d
o
cumentatio
n
f
i
xes to copy
_
notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joh
a
n Herland
notes
.
c: H
e
xify SHA1 in die() message
from ini
t
_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
René
Scharfe
notes: allow --dry-run
for -n and --verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matthi
e
u
Moy
Document -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
B
rad K
i
ng
Docu
m
entation: ci
t
e git-am f
r
om git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Tho
m
a
s
R
ast
t7003: fix
su
b
directory-fi
l
te
r
test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan N
i
eder
Allow
"check-ref-format --branch" from subdi
r
e
c
tory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
a
t
han
N
ied
e
r
ch
e
ck-ref-format:
h
andle subcommands in sep
a
rate func
t
i
o
n
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu Moy
p
retty-op
t
ions
.
txt: mat
c
h
--for
m
at's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
J
unio C Ha
m
a
n
o
Merg
e
branch
'
sv/maint-
d
iff-q
-
clear-f
i
x' into maint
commit
|
commitdiff
|
tree
2010-08-03
Juni
o
C Haman
o
Merge
b
ran
c
h 'rr/svn-fe' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge br
a
nch 'p
t
/git-gui' in
t
o
maint
commit
|
commitdiff
|
tree
2010-08-03
Ramk
u
m
a
r
R
a
m
a
chandra
cont
r
ib
/
svn-fe:
A
dd the svn-fe target to
.
g
itignor
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar Ram
a
chandra
con
t
ri
b
/svn-fe:
Fix IncludePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Merge branch 'ab/
t
ap' into maint
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjö
r
ð Bjarm
a
son
test-lib: Remove 3 year 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ð Bjarmason
test-lib:
I
gnore --quiet under
a TAP harnes
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Juni
o
C Ha
m
ano
Merge gi
t
://repo
.
or
.
c
z
/
gi
t
-gui into
pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Thomas Rast
Document
a
tion
/
r
e
v
-
parse
:
quot
i
n
g
is
r
equired w
i
th
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o C Hamano
Doc
u
mentati
o
n
: repo
r
t
i
ng bug
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio
C
H
a
mano
Fix
DIFF_QUEU
E
_CL
E
AR re
f
actoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
K
i
l
z
er
F
i
x
git r
e
base --continue
t
o work with touche
d
files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Mat
t
hieu Moy
Docume
n
t ls
-
f
i
les -t as semi-obsolet
e
.
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 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
H
amano
S
y
nc with 1
.
7
.
0 ser
i
es
commit
|
commitdiff
|
tree
2010-07-27
Junio C H
a
m
ano
Git 1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jonathan Nieder
c
o
nfig --ge
t
--path: check for uns
e
t $HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Stephen B
o
yd
commit: r
e
move full
s
t
o
p from usag
e
h
el
p
for -
u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Ma
t
thieu Moy
Clarify help message when no
r
emote is
specif
i
ed in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefil
e
:
a
d
d
c
h
eck-
d
ocs exception fo
r
gitrevisions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thoma
s
Rast
Fix 'git' wra
p
per usage
s
tring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
h
omas Rast
Documentation/git-push: Explain st
a
tus out
p
ut in mo
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
hom
a
s
Ras
t
D
o
c
u
m
e
n
t rec
e
ive
.
d
e
nyD
e
l
e
te
C
u
rrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast execl*() NULL sen
t
inels to
(
ch
a
r *)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
N
guyễn Thái Ngọc Duy
git-read-
t
r
ee
.
txt:
a
c
knowledg
e
the
d
irectory mat
c
h
in
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jon Seymour
INSTALL
:
c
onfig
u
r
e
/etc/xml/ca
t
alog to build d
o
cs on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Johann
e
s Six
t
t
3
7
00-add: fix dependence on st
d
out and stderr buffer
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Cas
e
y
git-rebase--inter
a
ctive
.
sh: use
p
r
intf instead of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Pani
k
e
Add
a
g
oogle-chrome option for w
e
b
-
-
bro
w
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio
C
Ham
a
no
Merge branc
h
'maint-
1
.
7
.
1' i
n
t
o maint
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C Hamano
M
e
rge branch 'maint-1
.
7
.
0' int
o
maint-
1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
a
m
a
no
Merge branch 'maint-
1
.
6
.
6' into
maint
-
1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio C
H
amano
Merge branch 'main
t
-
1
.
6
.
5' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
St
e
phen Boyd
request-pull
.
txt: Docu
m
ent -
p
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o C Ha
m
ano
Mer
g
e branch 'main
t
-
1
.
6
.
4'
i
nto
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
Check
si
z
e of
p
ath
b
uffer
before writing in
t
o it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o
C H
a
ma
n
o
G
i
t 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C Ha
m
ano
tests: corre
c
t
"d
o
es reflog exist?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
B
r
andon C
a
s
e
y
t/:
w
o
rk around one-
s
h
ot v
a
r
iable as
s
i
gnme
n
t with test_m
u
st_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t
/README: c
o
rrect an e
x
ception when brea
k
ing a && chain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Case
y
t/{t5541,
l
ib-h
t
tp
d
}:
r
e
place
proble
m
a
t
ic '!()'
n
otatio
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700: co
n
vert two uses
o
f ne
g
a
tion
o
perator '
!
'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C H
a
mano
M
e
r
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-20
B
ran
d
o
n
Case
y
t
/
READM
E
: clarif
y
test_must
_
fail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
G
r
eg Brockman
C
h
eck
s
i
ze of path buf
f
er before writing
i
nto it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
u
nio C H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Th
i
elow
u
pda
t
e-s
e
rver-i
n
fo: Sho
r
t
en read_pack_i
n
f
o
_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arn
f
jörð Bj
a
rma
s
on
git ad
d
: Add --igno
r
e-mis
s
ing to SYNOPSIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar
Arnfjörð B
j
ar
m
ason
git submodule add: Remove old
docs about implicit
-
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehm
a
nn
git su
b
m
o
dule add: Require the new --forc
e
o
pt
i
on to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
i
o C
H
aman
o
Merge bran
c
h 'jl/add-n-ignor
e
-missing'
commit
|
commitdiff
|
tree
2010-07-19
Da
v
id Agui
l
ar
Docume
n
tation: Expl
a
in git-m
e
rgetool's
u
se of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
Me
r
ge branch 'jc/diff-m
e
rge-bas
e
-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Ra
s
t
Only r
u
n
a
ggreg
a
te-results over a
c
tual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan Nieder
Add a sample user for the svndump libr
a
ry
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
diff A
.
.
.
B:
d
o not limi
t
t
he syn
t
ax too nar
r
owly
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Mer
g
e branch 'jn/p
a
ginate-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio
C
Hamano
Merge branch '
w
p/
m
erg
e
-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C H
a
mano
Mer
g
e bran
c
h 'js/merge-r
r
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Haman
o
Merge branch
'
jc/diff-mer
g
e-base-multi'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Me
r
ge bran
c
h 'ns/merge-recursiv
e
-
uptodate'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C
Hamano
Merge br
a
n
ch 'jn/tests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge
branch 'eb/doc-lo
g
-manpage'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge branch 'j
n
/
grep-open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
ni
o
C Ham
a
no
Merge branch 'mg/revis
i
o
n-d
o
c'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
anch 'jk/maint-status-keep-inde
x
-timestam
p
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge
b
ranch 'jc
/
reba
s
e-i-comm
i
t-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch '
a
b/submo
d
ule-add-f'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merg
e
br
a
nch
'bc/mai
n
t-makefile-fixes'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Haman
o
Mer
g
e branch
'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentation: add
s
ubmodule
.
* t
o
the big configura
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan Niede
r
gitmo
d
ules
.
5
: url can be a re
l
ative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
P
a
v
an
K
umar Sunkara
gitweb: fix
esc_url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan Nieder
g
i
t --pa
g
i
nate:
paginate e
x
ternal commands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffian
ME
R
GE_
R
R is in
.
g
i
t, not
.
git/rr-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palmer
m
erge-tree
:
fi
x
where two br
a
n
c
h
es share no c
h
a
n
ges
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next