repo.or.cz
/
git
/
mingw.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
Johan H
e
r
l
and
git notes merge: Handle
r
eal, non-conflicting
no
t
e
s
.
.
.
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
Herland
b
uilti
n
/n
o
tes
.
c: Re
f
acto
r
creation of notes commits
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Her
l
and
git
notes merge: I
n
itial implementatio
n
han
d
ling
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
Joh
a
n
H
e
rland
builtin/notes
.
c:
S
plit not
e
s
r
e
f DWIM
m
ery in
t
o a separate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
notes
.
c: Use two
newlines (instead of one) whe
n
concatenatin
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
(trivial) t3303: Indent with t
a
b
s
instead of spac
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
es
.
h/
c
: P
r
opagate c
o
mbine_notes_f
n
return value
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
J
o
han Herla
n
d
notes
.
h/c: Allow combine
_
no
t
e
s
functions
to remove
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c:
R
eorder functions
i
n p
r
ep
a
rat
i
on fo
r
nex
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
notes
.
h: Make default_
n
otes_ref()
a
vailable in
n
otes
A
PI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
(
t
r
i
vial) notes
.
h
: Minor documentation fixes to copy_no
t
es()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
an
d
notes
.
c: Hexi
f
y SHA1 in die(
)
mess
a
ge from i
n
i
t_notes()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
R
ené Scharfe
notes
:
allow
--
d
ry-run for
-
n
a
nd --verbose for
-
v
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
M
a
tthie
u
Moy
Document -B<n>[/<m>], -M
<
n> an
d
-C<n
>
variants
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Brad Ki
n
g
Document
a
tion: cite git
-
am fr
o
m git-apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-09
Thomas
R
a
s
t
t7003
:
f
ix
subdirec
t
ory
-
filter
te
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
J
o
nathan
N
i
eder
Allow "check-r
e
f-fo
r
mat --branch" from
s
u
bdirectory
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Nieder
c
h
eck-ref
-
f
o
rmat
:
handle sub
c
ommands in separate functions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu
M
oy
prett
y
-
o
ptions
.
txt
:
matc
h
--f
o
rmat's documentat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Juni
o
C
Hamano
M
erge branch 'sv/maint-diff-q-clear-fix' into ma
i
n
t
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge bran
c
h
'
rr/svn-fe' into maint
commit
|
commitdiff
|
tree
2010-08-03
J
unio C Hama
n
o
Merge branch 'pt/git-g
u
i' into maint
commit
|
commitdiff
|
tree
2010-08-03
Ra
m
k
u
mar Ramachandra
contrib/svn
-
fe
:
Add the svn-fe target
to
.
gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-03
Ramk
u
m
ar Ramachan
d
ra
contrib/sv
n
-fe: F
i
x IncludePath
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
M
erge b
r
a
nch
'ab/tap'
into
m
aint
commit
|
commitdiff
|
tree
2010-08-02
Æ
v
a
r
A
rnfjörð
B
ja
r
mason
test
-
li
b
:
Remove 3 ye
a
r old no-op --no-python option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjör
ð
B
j
armason
t
est-li
b
: Ignore --quiet
under a TAP harn
e
ss
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hama
n
o
M
e
rge g
i
t:
/
/repo
.
or
.
cz/git-gui into pt/git-g
u
i
commit
|
commitdiff
|
tree
2010-08-02
Thomas
Ra
s
t
D
ocumentati
o
n/rev
-
p
a
rse: qu
o
ti
n
g is req
u
ired with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Documentati
o
n:
r
e
p
o
rtin
g
bugs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Fix DI
F
F_QUEUE_CLEAR refactoring
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
D
avid D
.
Kilzer
Fix git rebase --co
n
tinue
to work with
t
ouched files
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu Moy
Document ls-files -t
as semi
-
obsolete
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Juni
o
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
Sy
n
c with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Junio
C
Hamano
G
it 1
.
7
.
1
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
Sync 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
Jona
t
han
N
ieder
config
--
g
et --pat
h
: c
h
eck for u
n
s
e
t
$
HO
M
E
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
S
tephe
n
Bo
y
d
co
m
m
i
t: re
m
ove full stop
f
rom
u
sage help for -u
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Matthieu
Moy
C
l
arify help
message when no remote is speci
f
i
ed in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Thom
a
s
Ras
t
Makefi
l
e: add check-
d
oc
s
exceptio
n
for gitre
v
isions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-27
Th
o
m
a
s Ra
s
t
Fix 'git'
wrapper usage string
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as Rast
D
ocumen
t
ation/git-push:
Ex
p
l
a
in status o
u
tput in more
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
D
o
c
ument
receive
.
d
e
n
yDele
t
eCurren
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Tho
m
as Ras
t
Cast execl*() NUL
L
sentinel
s
to
(
ch
a
r *)
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
.
tx
t
: 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:
c
o
n
f
igure
/etc/xml/catalog t
o
build docs
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
J
o
h
a
nnes Sixt
t3700-add: fix dependence on stdout and
s
tde
r
r
buffering
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Brand
o
n
Casey
git-rebase-
-
i
nteractive
.
sh: use printf instead of
e
c
ho
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Nathan
W
.
Panike
Add
a
googl
e
-chrome
o
ption
f
or web--browse
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Juni
o
C Hamano
Merge
branch
'
m
aint-1
.
7
.
1' int
o
maint
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
ama
n
o
Merge branch
'
m
a
int
-
1
.
7
.
0'
i
nto maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C H
a
ma
n
o
Merge branch
'
m
aint-1
.
6
.
6' into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Ju
n
io C Hamano
Me
r
ge br
a
nch 'maint-1
.
6
.
5' in
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen
Boyd
request-pull
.
txt
:
Docu
m
ent -p o
p
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-26
Junio C
Hamano
Merge branch 'maint-1
.
6
.
4' into ma
i
nt-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg B
r
ockman
Check si
z
e of pat
h
buffer befo
r
e writing into it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ham
a
no
Git 1
.
7
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io
C
Hamano
tests: co
r
rect
"
d
oes reflog exist?" tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Brand
o
n Casey
t/: work a
r
ound one-shot
v
ariable assignme
n
t wit
h
test_must_fail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan Nieder
t/
R
EADM
E
: correct an exception
when
b
reaking a &
&
c
h
ain
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/{t5541
,
lib-httpd
}
: replace
p
r
o
blem
a
tic '!()'
nota
t
i
o
n
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/t3700: conver
t
t
w
o uses
o
f ne
g
ati
o
n oper
a
tor
'!'
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon C
a
s
ey
t
/
READ
M
E: clar
i
fy test_m
u
st_
f
ail description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check si
z
e of path b
u
f
fe
r
be
f
ore writing
i
nto i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
uni
o
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf
Thielow
u
p
date-ser
v
er-
i
nfo: Shorten re
a
d_pack_info_
f
ile()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æv
a
r Arnfjörð Bja
r
mason
git add: Add -
-
ignore-miss
i
ng to SYNOPS
I
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Æ
v
ar A
r
nfjör
ð
Bj
a
rmason
git
s
u
bmodule add:
Remove old docs about
i
mplicit -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
J
ens Lehm
a
nn
git
submodule
add: R
e
quire the new --force option to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-19
Junio C
H
amano
Merge branch 'jl/add-n-igno
r
e-missing'
commit
|
commitdiff
|
tree
2010-07-19
D
avid Agu
i
lar
Docum
e
ntat
i
on:
E
xpl
a
in git-merg
e
to
o
l's
use of tempor
a
r
y
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
a
man
o
Merge b
r
anch 'j
c
/
diff-merge-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-16
Tho
m
as Rast
Only
run
aggrega
t
e-resul
t
s over a
c
t
ual counts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-16
Jona
t
han Niede
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
d
iff A
.
.
.
B: do n
o
t
limit
the sy
n
tax too narrow
l
y
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Mer
g
e bran
c
h 'jn/pa
g
i
n
a
te-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
M
erge
branch 'wp/merge-
t
r
ee
-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C
H
a
mano
Merge b
r
anch 'js/
m
er
g
e-rr
-
f
ix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge b
r
anc
h
'jc/diff-m
e
rge-base-
m
ulti'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C
H
amano
Merge
bran
c
h
'
ns/merge-recursive-uptodate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Me
r
ge b
r
anch 'jn/
t
ests'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge branch
'eb/
d
o
c
-log-manpa
g
e'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
r
g
e bran
c
h 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
J
u
nio
C Hamano
Merge bran
c
h 'mg/revision-d
o
c'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge b
r
an
c
h 'jk
/
mai
n
t-status-ke
e
p
-
i
n
dex-timestamp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ham
a
no
Me
r
g
e branch 'jc/rebase-i-commit
-
msg-f
i
x'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Mer
g
e branc
h
'ab/submodule-ad
d
-f'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Ha
m
ano
Merge
b
ra
n
c
h
'b
c
/maint-makef
i
le-fix
e
s'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-07-15
J
onathan Ni
e
der
Docum
e
ntation: ad
d
s
u
bmodule
.
* to the big con
f
iguration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
g
itm
o
dules
.
5: ur
l
can be a rela
t
ive path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-15
Pavan
Kumar Sunkara
gitweb: fix esc_
u
rl
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Jonatha
n
Nieder
g
it --paginate: pag
i
nate
external commands
again
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
J
ay
Soff
i
an
MERGE_RR is
in
.
git, not
.
gi
t
/
r
r-cache
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Will Palm
e
r
merg
e
-
t
r
e
e
:
fix w
h
e
r
e two bra
n
c
h
es share no chan
g
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
W
ill Palmer
add bas
i
c tests
f
or mer
g
e
-
tree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-07-14
Junio C Hamano
G
it 1
.
7
.
2
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next