repo.or.cz
/
git
/
jrn.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: Handle real, non-conflicting notes merges
2010-11-17
J
o
han Herla
n
d
g
i
t notes me
r
ge
:
Handle re
a
l, non-conflicting notes
.
.
.
Thanks-to: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herla
n
d
b
ui
l
tin/notes
.
c: Refactor creation
of notes commits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git notes merge: Initi
a
l imp
l
e
m
entation
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
J
o
ha
n
Herland
builtin/notes
.
c: Spli
t
n
o
tes ref DWIMmery in
t
o a
separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herl
a
n
d
notes
.
c: Use two newlines (ins
t
e
a
d of one) w
h
en co
n
catenatin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
rland
(tri
v
ial
)
t3303: I
n
d
ent with tabs instead of spaces
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
J
o
h
an Herland
n
otes
.
h/c
:
Propagate combine_notes_fn return val
u
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Joha
n
Her
l
a
n
d
not
e
s
.
h/c:
A
llow combine_notes
funct
i
ons t
o
re
m
o
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
h
a
n H
e
rland
notes
.
c: Reorder fu
n
ctions in preparat
i
o
n
for next
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan
Herland
no
t
e
s
.
h: Make default_notes
_
ref() av
a
ilable in
notes API
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(trivial)
n
o
t
es
.
h
:
M
inor documen
t
ation fixes to
c
opy_n
o
tes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
notes
.
c: He
x
ify SHA1
in
d
ie()
message from init_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Re
n
é
S
charfe
not
e
s: allow --dry-run for -n and --verbose for -v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Matthieu Moy
Document -B<n>[/<m>], -
M
<n> and -C<n> v
a
r
ia
n
ts of
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
B
rad King
Docum
e
ntation: cite
g
i
t-am f
r
o
m
git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Tho
m
as Rast
t
7
0
0
3: fix subdirecto
r
y-filter test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jo
n
a
t
han Ni
e
der
A
llow "check-ref-format --branch" from subdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jon
a
tha
n
Nieder
check
-
ref-format: handle
subc
o
mmands
in separate functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu
M
oy
pretty-options
.
txt: match
-
-
format's documentation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o C
Haman
o
M
e
r
ge b
r
anch '
s
v
/maint-diff-q-clear-fix' in
t
o m
a
int
commit
|
commitdiff
|
tree
2010-08-03
J
u
ni
o
C Ha
m
ano
Merge branch
'r
r
/
s
vn
-
fe' into m
a
int
commit
|
commitdiff
|
tree
2010-08-03
Junio C Haman
o
Mer
g
e branch 'p
t
/git-gui' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar Ra
m
acha
n
dra
contri
b
/s
v
n-
f
e
: Add the svn-
f
e
t
a
rget t
o
.
giti
g
nore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar Ramacha
n
dra
contrib/svn-fe: Fix I
n
c
l
udeP
a
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
Hamano
Merge branch 'a
b
/tap'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-02
Ævar
Arnfjörð Bj
a
rmas
o
n
test-l
i
b
:
Remove 3 year old n
o
-
op --n
o
-python option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Æ
va
r
Arn
f
jörð Bjarm
a
son
test-
l
ib: Ig
n
o
r
e
--quiet under a TAP
h
arness
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
H
amano
M
e
rge g
i
t://repo
.
o
r
.
cz/git-gui i
n
to pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Tho
m
as R
a
st
D
o
cumentation/rev-parse
:
quoting is required with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Documenta
t
ion:
r
eporti
n
g bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
H
am
a
no
Fix
D
IFF_QUEUE_C
L
EAR refactor
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
D
a
vi
d
D
.
Kilzer
Fix git rebase --continue
to work with touched files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Document ls-files -t as semi
-
obsole
t
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
Junio 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
J
unio C
H
amano
S
ync with 1
.
7
.
0 se
r
ies
commit
|
commitdiff
|
tree
2010-07-27
J
unio C Hamano
Git
1
.
7
.
0
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
ath
a
n
Nie
d
er
conf
i
g
--get --path: c
h
eck for unset $HOME
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
St
e
phen Boyd
c
o
m
mit
:
remove full st
o
p from usage help for -u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Ma
t
t
h
ieu
Mo
y
Clarify h
e
l
p m
e
ssage w
h
en no
remote is spe
c
ified in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Ma
k
e
file
:
add check-docs e
x
cep
t
ion for gitre
v
isions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thoma
s
Rast
Fix 'git' wr
a
pper usage
s
t
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Document
a
tion/g
i
t-push: Explain status out
p
ut in more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Th
o
mas
R
a
s
t
Document recei
v
e
.
denyDelet
e
C
urrent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
T
ho
m
as Rast
Cast execl*
(
) NULL sentinels to (char *
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
N
g
uyễn Thái Ngọc Duy
git-read-tree
.
txt:
ac
k
n
o
wled
g
e the dire
c
tory
m
atchi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
n Seymour
INSTALL: configure /etc/xml/catalog to build doc
s
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Johannes Sixt
t3700-a
d
d:
fix dependence
on stdout and
stderr buff
e
ring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brand
o
n Casey
git-rebase--interac
t
ive
.
sh: use prin
t
f instead of echo
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
N
a
th
a
n W
.
Pan
i
ke
A
d
d
a google-c
h
rome option for web--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C
Hamano
Merge branc
h
'maint-1
.
7
.
1' into ma
i
nt
commit
|
commitdiff
|
tree
2010-07-26
Junio
C Hamano
Merge
bran
c
h
'ma
i
n
t
-1
.
7
.
0' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge branch 'm
a
int
-
1
.
6
.
6
'
into
m
aint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Merge bran
c
h
'
maint-1
.
6
.
5' into maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Step
h
e
n
Boy
d
request-pull
.
t
xt: Do
c
u
m
ent -p option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C Ham
a
no
M
erge branch 'maint-1
.
6
.
4' i
n
t
o ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
Chec
k
size of p
a
th
b
uf
f
e
r before writing
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
Junio C Hamano
tests: correct "does re
f
l
og exist?
"
tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Br
a
ndon
Casey
t/
:
work aroun
d
one-sh
o
t
variable
a
ssig
n
m
ent with
test_mus
t
_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jon
a
than Nieder
t/README: correct an exce
p
tion when
b
re
a
king a && cha
i
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5
5
41,lib-httpd}
:
repl
a
ce problematic '!()
'
notation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/
t
3700: convert
t
w
o
uses of negation oper
a
tor
'
!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
J
u
n
i
o
C Hamano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-07-20
B
randon Case
y
t/README: clari
f
y
test_
m
ust_fai
l
description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg
Brockman
Check size of p
a
th buffer before writi
n
g into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2010-07-19
R
al
f
Th
i
elow
update-server-info: Shorten read_
p
ack_info_file()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð Bjarmason
git add: Add --ignore-missing to SYNO
P
SIS
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar Arn
f
j
ö
rð Bjar
m
ason
g
it submodule
a
dd: Remov
e
o
l
d docs
a
bout implicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
e
ns
L
ehma
n
n
git submodule ad
d
: Require the new --force o
p
tio
n
to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio
C Haman
o
Merge branch 'jl/ad
d
-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Aguilar
D
o
cumentation: E
x
plain
g
it-mergetool's
u
s
e of temporary
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
unio C Hamano
Me
r
ge
branch 'jc/diff-merge
-
base
-
multi'
commit
|
commitdiff
|
tree
2010-07-16
Thomas Ra
s
t
Only
r
un agg
r
eg
a
t
e
-res
u
l
t
s over a
c
tual
counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
J
onat
h
an N
i
ede
r
Add a sample user for the svndump library
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C Hamano
dif
f
A
.
.
.
B:
do no
t
l
i
mit t
h
e syntax to
o
narrowly
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C Hamano
M
e
rge br
a
nch 'jn/pag
i
n
a
te
-
f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io C Ha
m
a
no
M
erge bran
c
h 'wp/
m
erge-tree-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hamano
Merge
b
ran
c
h '
j
s/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Ha
m
ano
Merge branch 'jc/
d
i
f
f-merge-base-mu
l
t
i
'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hamano
Merge branch '
n
s/merge-recursive-u
p
todate'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C H
a
mano
Merge branch 'jn/tests
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
branch
'eb/doc-log-man
p
age
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C
H
amano
Me
r
ge branch 'jn
/
gre
p
-
o
p
en'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Merge branch 'm
g
/revision-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C
H
amano
Merge branch 'jk/maint-status-ke
e
p-index-tim
e
stamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hama
n
o
Merge branch 'jc/reba
s
e-i-commit-msg-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge branch
'
a
b
/su
b
modu
l
e-add-f'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
M
e
r
ge
b
ranch '
b
c/main
t
-m
a
kefil
e
-fixes'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio C Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
Jo
n
athan
N
ied
e
r
Documentation: add
s
ubm
o
dule
.
* to the big con
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jon
a
t
h
an Ni
e
der
gi
t
modules
.
5
:
u
rl
can be
a
relative path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pa
v
an Kumar S
u
n
k
ara
gitweb: fix esc_ur
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jo
n
athan Ni
e
der
git --paginate: paginat
e
exte
r
nal
c
ommands again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jay Soffi
a
n
MERGE
_
RR is in
.
git, not
.
git/
r
r-c
a
che
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will
Palm
e
r
m
e
rge-t
r
ee: fix where two branches share
no changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
il
l
Palm
e
r
add basic te
s
ts for merge-tr
e
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio
C
H
amano
Git 1
.
7
.
2-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next