repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Provide 'git merge --abort' as a synonym to 'git reset --merge'
2010-11-17
Johan Herland
Prov
i
de 'git mer
g
e
--abort' as a synonym
to 'git r
e
s
et
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herlan
d
cmd_
m
erge(): Pars
e
options before checking MERGE_HEAD
-
Junio C Hamano
: fixup minor style issues
Thanks-to:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan Herl
a
nd
Provide 'git notes get-
r
ef' to ea
s
i
ly retri
e
v
e
current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan H
e
r
l
and
git notes
m
erg
e
: Add testcases for merging note
s
trees
.
.
.
-
Junio C Hamano
: Portability: Don't string-compare...
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
git notes
m
erge: Add another auto-resolving strategy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
g
it not
e
s
merge: --com
m
i
t
should fail
i
f unde
r
lying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han
Herland
git n
o
tes merge:
L
ist conflicting notes i
n
n
o
tes me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git not
e
s merge: Manual conflict resolution, par
t
2/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herla
n
d
g
it notes
me
r
ge: Manual co
n
fli
c
t resolution,
p
art 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
Document
a
tion
:
Prelim
i
nary do
c
s on 'git notes merge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
and
git notes merge
:
Add aut
o
mat
i
c conflict resolvers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
git not
e
s merge: Hand
l
e real, non-conflicting note
s
.
.
.
-
Junio C Hamano
: fixup minor style issues
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 Herland
builtin/n
o
tes
.
c: Refactor creation
of n
o
tes commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
an
d
g
i
t notes merge
:
In
i
tial im
p
lementation handling trivial
.
.
.
-
Junio C Hamano
: fixup minor style issues
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
: Split note
s
ref DWIMmery i
n
to a
s
eparate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Her
l
a
nd
n
ot
e
s
.
c: Use
two ne
w
li
n
e
s (ins
t
ead of one) when concatenati
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joh
a
n Herland
(trivia
l
)
t
3303: Indent w
i
th
tabs inst
e
ad of
spaces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
n
o
t
es
.
h
/
c: Propaga
t
e combine_notes_
f
n return val
u
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
J
oh
a
n
H
e
r
land
notes
.
h/c:
A
l
l
ow combi
n
e_notes functio
n
s to remo
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
a
n
d
notes
.
c:
R
e
order functi
o
n
s in preparation for next
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Her
l
and
n
otes
.
h: Make default_notes_ref()
a
vailable in
notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
a
n Herland
(trivial) notes
.
h:
Minor d
o
cume
n
t
a
ti
o
n fi
x
es
t
o
copy_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an Her
l
and
notes
.
c
:
Hexify
SHA1 i
n
die() message fro
m
init_notes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
R
ené Sc
h
arf
e
notes
:
allow --d
r
y-run for -n and --verbose for
-
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Matt
h
i
e
u Moy
Document
-B<n>[/<m>
]
, -M<n> and -C<n>
v
ariants of
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
D
o
c
umenta
t
ion: ci
t
e git-am from git
-
apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Thomas Rast
t7003: fix s
u
bdir
e
cto
r
y
-
fil
t
e
r test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan
Niede
r
A
llow "check-
r
ef
-
f
o
rmat --br
a
nch" fro
m
s
u
bd
i
rectory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
o
n
a
t
han Ni
e
der
check-ref-format: hand
l
e subcommands in
separa
t
e functions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matthieu
M
o
y
pr
e
tty-opti
o
ns
.
txt:
matc
h
--f
o
rmat's do
c
umentat
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
Merge branch 'sv/m
a
i
n
t-diff-q-clear-fix'
i
nto mai
n
t
commit
|
commitdiff
|
tree
2010-08-03
Jun
i
o C Hamano
Merge br
a
nch 'rr/svn
-
fe'
i
nto maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C H
a
m
a
no
Merge
b
ranch 'pt/
g
it
-
gu
i
' into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
Ramku
m
ar Ramachand
r
a
c
o
n
trib/svn
-
fe: Add the svn-fe ta
r
get t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
Ramkumar R
a
machandra
contr
i
b/svn-fe:
Fix
I
nclud
e
Path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio
C
Hamano
Merge branch 'ab/tap' into maint
commit
|
commitdiff
|
tree
2010-08-02
Æ
v
ar
A
r
nfjörð Bjarmason
test-lib: Remove 3 year old no-
o
p
--no-
p
ython o
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Ar
n
fjörð Bjarmason
test
-
lib
:
Ignor
e
--
q
u
i
e
t
under a TAP har
n
ess
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C Hamano
Merge git://repo
.
or
.
cz/git-
g
ui int
o
pt/git-g
u
i
commit
|
commitdiff
|
tree
2010-08-02
Thomas Ra
s
t
D
o
cum
e
ntation/rev-parse
:
quotin
g
is
r
equi
r
ed with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
unio C Hamano
D
o
cument
a
tion: reporting bugs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Junio C
H
amano
Fix DI
F
F_QUEUE
_
C
LE
A
R re
f
a
c
toring
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
K
il
z
er
Fix git rebase -
-
continue to work wit
h
touched files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu M
o
y
Docu
m
en
t
ls
-
files
-
t as semi-obsolete
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
G
it 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
J
u
n
i
o
C
H
amano
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 Haman
o
Sync with 1
.
7
.
0 series
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
a
than Nieder
c
onfig --g
e
t --pa
t
h: check for unse
t
$HO
M
E
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
St
e
p
h
en
Boyd
commit: r
e
move
f
u
l
l
stop from usage help for -u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
M
a
t
thieu Moy
Clar
i
fy
h
elp message when no
r
e
mote is s
p
ecified
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefile: add check-docs exception for gitrevis
i
o
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Fi
x
'git' w
r
apper
usage stri
n
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
T
homas Ra
s
t
Documenta
t
ion/git-pu
s
h
:
Exp
l
ain
status
o
utp
u
t in more
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
D
o
cumen
t
receive
.
d
enyD
e
l
e
teCurrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Th
o
mas Ra
s
t
C
as
t
execl*() NULL sentinels to (char *)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Ng
u
yễn Thái Ng
ọ
c Duy
git-read-tr
e
e
.
txt: acknowled
g
e the directory m
a
tc
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
on Seymour
INSTALL: conf
i
gure /
e
tc/xml/catalog
to bui
l
d
do
c
s on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Johannes Sixt
t3700-add: fix dep
e
n
dence on stdou
t
and std
e
rr buffering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Brandon Cas
e
y
g
it-rebase--i
n
teractive
.
sh: use printf instead of echo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
N
a
t
h
an W
.
Panike
A
d
d
a google
-
c
h
r
ome option f
o
r we
b
--b
r
o
wse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Jun
i
o
C Hamano
M
e
rge
branch 'maint-
1
.
7
.
1' into
m
aint
commit
|
commitdiff
|
tree
2010-07-26
Junio C Haman
o
Merge branch 'maint-1
.
7
.
0' into maint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C
H
amano
M
er
g
e branch 'maint-1
.
6
.
6' into
m
ai
n
t-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio
C H
a
m
ano
Merge branch 'maint-1
.
6
.
5' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
St
e
phen Boyd
requ
e
st-pu
l
l
.
t
x
t: Do
c
ume
n
t
-
p option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio C Hamano
Merge branch '
m
aint-1
.
6
.
4' i
n
t
o
maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
C
h
eck size
o
f
path buf
f
er
b
e
fore
writing into
i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Ju
n
io C Hamano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio C Ha
m
ano
test
s
: correct "does reflog ex
i
st?"
t
ests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
B
r
andon
Casey
t/: work ar
o
und one-shot variable assi
g
nm
e
nt with
t
e
s
t
_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
Nieder
t
/
README:
cor
r
ect a
n
exception
when breaking a
&
&
c
hain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Case
y
t/{t
5
541,
l
i
b
-
h
t
t
p
d}: replace
p
roblem
a
t
i
c '!
(
)' notat
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
B
r
andon C
a
sey
t/t3700: convert two uses of negat
i
o
n
operator
'!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C
H
amano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/README: clarify t
e
st_must_fail descr
i
p
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Brockman
Check size of path buffer before writ
i
ng into it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Juni
o
C Hama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upda
t
e-server
-
inf
o
: Short
e
n
re
a
d_pac
k
_info_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æv
a
r Arnfj
ö
rð
B
jarmaso
n
gi
t
add
:
Add --ig
n
ore-missing to SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Æ
va
r
Arnfjörð
Bjarmason
git submo
d
ule ad
d
: Remove
o
ld do
c
s about implicit -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jens Lehm
a
nn
gi
t
s
u
bmodule
a
dd: Req
u
ire the ne
w
--fo
r
ce
o
ption to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Junio C Hamano
Merge bra
n
ch 'jl/add-
n
-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
David Agu
i
lar
Documentation: Explain git-mer
g
etool's
use of temporary
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio
C
H
amano
Merge branch 'jc/diff-merg
e
-base-multi'
commit
|
commitdiff
|
tree
2010-07-16
Th
o
m
as Rast
Only run
aggregate
-
r
e
sults over actual co
u
nts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonat
h
an Nieder
Add a sample use
r
for the svnd
u
mp
library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
am
a
no
d
iff A
.
.
.
B: do
n
ot limit the syn
t
ax too narr
o
wly
commit
|
commitdiff
|
tree
2010-07-15
Junio
C Hamano
Merge branch 'j
n
/paginate
-
fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
i
o C Hamano
Merge branch 'wp/m
e
rge-tree-fix'
commit
|
commitdiff
|
tree
2010-07-15
Ju
n
io
C
H
ama
n
o
M
e
r
g
e
b
r
anch 'js/merge-r
r
-fix'
commit
|
commitdiff
|
tree
2010-07-15
J
uni
o
C Hamano
M
erge bran
c
h 'jc/diff-mer
g
e-ba
s
e
-
multi'
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Ham
a
no
Merge
b
ranch 'n
s
/
merge-recursi
v
e
-uptoda
t
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge branch 'jn/te
s
ts'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch 'eb/doc-log
-
m
a
np
a
g
e
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge bra
n
c
h 'j
n
/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch
'
mg
/
revisio
n
-doc'
commit
|
commitdiff
|
tree
2010-07-15
J
u
n
i
o C Ha
m
a
n
o
M
erge branch 'jk/maint-s
t
atus
-
keep
-
i
ndex-times
t
a
m
p
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
M
erge branch
'
jc/rebase-i-co
m
mi
t
-msg-f
i
x
'
commit
|
commitdiff
|
tree
next