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
Provide 'git merge --abort' as a synonym to 'git reset --merge'
2010-11-17
Johan Her
l
an
d
Pr
o
vide
'
gi
t
m
erge --abort' as
a
synon
y
m
to 'git rese
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
o
han Herl
a
n
d
cmd_merge(): Par
s
e
o
ptions before che
c
king MERG
E
_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
Johan Herland
Pro
v
ide 'git no
t
es g
e
t-ref' to easily ret
r
ieve current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
note
s
m
er
g
e: Add t
e
stc
a
se
s
f
o
r
mergi
n
g notes
t
r
ees
.
.
.
-
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
Johan H
e
rland
git notes merge: Add
an
o
ther auto-resolving strategy
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan He
r
l
and
gi
t
notes merge: --commit s
h
ould fai
l
if underly
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git notes me
r
g
e: Lis
t
conflicti
n
g n
o
tes i
n
notes merge
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
erland
g
it notes merge: Manual conflict resolut
i
on, part 2/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
He
r
l
a
nd
git n
o
t
e
s mer
g
e:
Manual c
o
n
f
lict resolu
t
ion, part 1/2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Joha
n
Herland
Documentation: Pre
l
iminary
d
ocs on 'gi
t
notes m
e
rge'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
git
not
e
s
merg
e
: Add autom
a
t
ic conflict resolvers
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git not
e
s merge: Handle real, non
-
conflicting notes
.
.
.
-
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
Herland
builtin/notes
.
c
: Refactor creation of notes commits
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herla
n
d
git notes
m
e
rge:
I
nitial
impl
e
mentation handling tr
i
v
ial
.
.
.
-
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
Herlan
d
b
uiltin/
n
ote
s
.
c:
S
pli
t
notes re
f
DW
I
Mmery i
n
to
a
separate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan Herland
no
t
e
s
.
c: Use two
n
ewlines
(instead of
o
ne) wh
e
n conc
a
tenatin
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
J
ohan
H
er
l
a
n
d
(trivial) t330
3
: Indent
w
it
h
tabs instea
d
of spaces
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-17
Johan
H
e
rland
no
t
es
.
h
/
c:
P
ropagate
c
ombine
_
note
s
_fn r
e
turn
v
alue
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herla
n
d
note
s
.
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 Herland
notes
.
c: Reord
e
r
f
unctions in preparation for next
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan Herland
notes
.
h
: Mak
e
de
f
ault_notes_ref(
)
available
i
n notes API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Jo
h
an
H
e
r
land
(
t
r
ivial)
notes
.
h: Minor docum
e
ntation fixes to
c
opy_n
o
tes()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-11-10
Johan He
r
land
notes
.
c: He
x
ify SHA1 in die() messag
e
from init_not
e
s()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Ren
é
S
c
harfe
not
e
s:
allow --dry-run f
o
r -n an
d
--
v
er
b
o
se for
-
v
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
M
atthieu Moy
Docume
n
t -B<n>[/<m>], -M<n> and -C<n> va
r
i
ants
o
f
.
.
.
from the explanations of
Junio C Hamano
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Brad King
Document
a
tion: cit
e
git-am f
r
om git-apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-09
Th
o
mas R
a
s
t
t70
0
3
:
fi
x
subdi
r
ectory-filter te
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
Jonathan Nie
d
e
r
Allow
"
check-ref-f
o
r
m
at --branc
h
" fr
o
m subdir
e
ctory
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-06
J
on
a
than Nieder
c
heck-ref
-
forma
t
: handle
subc
o
m
m
and
s
in
s
eparate function
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-05
Matthi
e
u
Moy
pretty-o
p
tion
s
.
t
xt: m
a
tch -
-
format's doc
u
me
n
tati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
J
u
n
io
C Hama
n
o
Merge branch
'
sv/
m
aint-
d
i
f
f
-q-cle
a
r-f
i
x'
i
n
to main
t
commit
|
commitdiff
|
tree
2010-08-03
Junio C Hamano
M
erge br
a
nch 'rr/svn-f
e
' into maint
commit
|
commitdiff
|
tree
2010-08-03
Junio C Ham
a
no
Merge branch 'pt/
g
i
t
-gui'
into ma
i
nt
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar Ra
m
achandra
contrib/svn
-
fe: Add t
h
e
s
v
n-fe tar
g
et to
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-03
R
a
mkumar Ramacha
n
d
r
a
co
n
trib/svn
-
fe:
Fix IncludePath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
u
nio
C
Hamano
Merg
e
branch 'ab/tap
'
i
n
to maint
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnf
j
örð Bjarmaso
n
test-lib: Rem
o
ve 3 year o
l
d no-op --no-python option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ævar Arnfjör
ð
Bjar
m
ason
t
est
-
l
ib: Ig
n
ore --quiet under
a
TA
P
ha
r
ness
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
J
unio
C
Hamano
M
erg
e
git://repo
.
or
.
cz/git
-
gui into pt/git-gui
commit
|
commitdiff
|
tree
2010-08-02
Tho
m
a
s
Rast
Documentati
o
n/rev-
p
arse: q
u
oting is requ
i
r
e
d with
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Jun
i
o C Hamano
Documentatio
n
: repor
t
i
n
g bugs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-02
Ju
n
i
o C Hamano
Fix DIF
F
_Q
U
EU
E
_
CLEAR refac
t
o
r
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
David D
.
Kilzer
F
i
x gi
t
rebas
e
--c
o
ntinue to work with touched files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-28
Matthieu M
o
y
Document ls-files -t as semi-obsole
t
e
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o
C Hamano
Git 1
.
7
.
2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
J
unio
C Haman
o
Sy
n
c with 1
.
7
.
1
.
2
commit
|
commitdiff
|
tree
2010-07-27
Jun
i
o
C Hamano
G
i
t 1
.
7
.
1
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Junio C Hamano
S
y
nc with 1
.
7
.
0 series
commit
|
commitdiff
|
tree
2010-07-27
J
u
n
io C Ha
m
ano
Git
1
.
7
.
0
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Jo
n
atha
n
Nied
e
r
co
n
fig --get --p
a
t
h
:
c
h
eck for unset $HOME
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Stephen Boyd
co
m
mit:
r
emove full stop from us
a
ge
help fo
r
-u
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
M
a
tth
i
eu Moy
C
l
arify help mes
s
age when no remote is specified
in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thomas Rast
Makefile:
a
d
d
check-do
c
s
excepti
o
n for gitrev
i
sions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-27
Thoma
s
Ras
t
F
i
x '
g
it' wrapper
u
s
age string
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
T
homas
Rast
Docum
e
ntation/git-push: Explain status
output in m
o
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas
Ras
t
Document receive
.
denyDe
l
et
e
C
u
rrent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Thomas Rast
Cast
execl*() NULL sentinels to (char *)
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
.
txt: acknowledge the directory mat
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
o
n
Se
y
mour
INSTALL: configure /etc/xml/catalog to
b
u
i
l
d docs on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
ohannes Sixt
t37
0
0-add
:
fix de
p
enden
c
e
on stdout an
d
stde
r
r buffering
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Brand
o
n
C
asey
g
i
t-
r
eba
s
e--interactive
.
sh: use prin
t
f inste
a
d of echo
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Nathan W
.
Panike
A
d
d a google-chrome option for web--browse
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
Junio C H
a
man
o
M
erge
branch
'm
a
int-1
.
7
.
1'
into m
a
int
commit
|
commitdiff
|
tree
2010-07-26
J
u
ni
o
C Ha
m
an
o
Mer
g
e branch 'ma
i
nt-1
.
7
.
0' into
m
aint-1
.
7
.
1
commit
|
commitdiff
|
tree
2010-07-26
Junio C Haman
o
Me
r
ge branch '
m
aint-1
.
6
.
6
'
into maint-1
.
7
.
0
commit
|
commitdiff
|
tree
2010-07-26
Junio C Hamano
Mer
g
e branch 'maint-1
.
6
.
5'
i
nto
m
a
in
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-07-26
Stephen Boyd
request-pull
.
t
x
t: Document -p option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-26
J
u
nio
C Ha
m
ano
M
er
g
e bran
c
h 'maint-1
.
6
.
4' in
t
o maint-
1
.
6
.
5
commit
|
commitdiff
|
tree
2010-07-25
Greg Brockman
Check size of path bu
f
fer before writing into
it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Junio
C
H
a
mano
Git 1
.
7
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jun
i
o C Hamano
te
s
ts: corre
c
t
"does
r
eflog exi
s
t?" tests
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Brandon Casey
t/: work around one-s
h
ot variable
assignment with test_must_fail
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
Nie
d
er
t/README: correct an ex
c
eption when break
i
ng a && chain
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Brandon Casey
t/
{
t5541,lib-h
t
tpd}: repla
c
e problem
a
tic '
!
()' not
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Bra
n
don Casey
t/t3700: conver
t
two uses of
n
egati
o
n operator '!'
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Junio C Ham
a
no
Merge bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2010-07-20
B
r
a
ndon Casey
t/README:
clarify test_must_fail descr
i
p
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-20
Greg Br
o
ckman
Check s
i
ze of path
b
uffer bef
o
re
w
r
i
ting
i
n
to it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Jun
i
o C Ham
a
no
Merge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
2010-07-19
Ralf Thielow
upd
a
te-server-in
f
o: S
h
orten read_pack_in
f
o_file()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
Bjarmason
git add: Add --
i
gnore-m
i
ssing to SYNOPSIS
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ævar Arnfjörð
B
jarmason
git submodule add
:
Remove old docs about implicit
-
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
J
e
n
s
L
e
hm
a
nn
git submodule add: Re
q
uire the new
-
-
f
orce option to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-19
Ju
n
io C
Hamano
Merge branch
'
jl/add-n-ignore-missing'
commit
|
commitdiff
|
tree
2010-07-19
Davi
d
Aguilar
Documen
t
ation: Explain git-mer
g
e
tool
'
s use of tempor
a
ry
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
J
u
nio C Haman
o
Merge branch
'jc
/
diff-merge-ba
s
e-multi'
commit
|
commitdiff
|
tree
2010-07-16
Thom
a
s Rast
Only run a
g
gregate-re
s
ults
o
ver actual co
u
nt
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
Add a sample user for the s
v
ndump library
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-07-16
Junio C
H
a
man
o
diff A
.
.
.
B:
do not li
m
it
t
h
e
synta
x
too narrowly
commit
|
commitdiff
|
tree
2010-07-15
J
unio C Hamano
Merge branch
'
jn
/
paginate-fi
x
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C
H
amano
Merge branch 'wp/m
e
r
g
e-tree-fix
'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o C Hamano
Me
r
ge branch '
j
s
/merge-rr-fix'
commit
|
commitdiff
|
tree
2010-07-15
Junio C H
a
mano
Mer
g
e b
r
anch 'jc/diff-merge-base-mu
l
ti'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merge
b
ranch 'ns/m
e
rge-r
e
c
u
rsive-u
p
todate'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
Merg
e
branch 'jn/te
s
ts'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hamano
Merge branc
h
'eb/
d
oc-log-man
p
age'
commit
|
commitdiff
|
tree
2010-07-15
Jun
i
o
C
Hamano
Merge branch 'jn/grep-open'
commit
|
commitdiff
|
tree
2010-07-15
Juni
o
C Hama
n
o
Merge br
a
nch
'
mg/
r
evision-doc
'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Ha
m
ano
Merge br
a
n
ch
'jk/maint-status-keep-
i
nd
e
x
-tim
e
st
a
mp'
commit
|
commitdiff
|
tree
2010-07-15
Junio C Hamano
M
e
rge branch 'jc/reb
a
s
e-i-commit-msg-fix'
commit
|
commitdiff
|
tree
next