repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
msvc: Fix a compiler warning due to an incorrect pointer cast
2010-01-19
Ju
n
io C
Ham
a
no
Merge commit 'v1
.
6
.
4
.
4-
8
-g8de6518' into maint
-
1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Fix
m
i
s-backport of t
7
002
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C H
a
mano
Updat
e
draft release
n
otes
t
o
1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
Jun
i
o C
Hamano
U
pdate dr
a
ft
r
e
l
ease not
e
s
t
o
1
.
6
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
H
a
mano
Mer
g
e branch 'dp/maint-1
.
6
.
5-fast
-
import-non-c
o
m
m
it
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
Merge b
r
anch 'jc
/
rerere'
commit
|
commitdiff
|
tree
2010-01-19
J
unio C Hamano
M
e
r
ge branch 'p
c
/uninteresti
n
g-submo
d
ule-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bra
n
c
h
'nd/in
c
l
ude-
t
e
rmi
o
s-for-osol
'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Haman
o
Me
r
ge branch 'js/wind
o
w
s'
commit
|
commitdiff
|
tree
2010-01-19
Ma
t
thieu Moy
branch: warn and refuse to set a b
r
anch as
a
tracking
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Jens Le
h
mann
P
erformance optimization f
o
r detection
o
f modified
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari
Liusvaara
Add
branch --set-
u
pstream
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Andreas
Grue
n
bac
h
er
builtin-a
p
p
ly
.
c: f
i
x the --- and +++ header filena
m
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liusvaa
r
a
Add git r
e
mot
e
set-url
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
D
aniel Barka
l
ow
Repla
c
e
parse_blob() wit
h
an explanatory c
o
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Me
r
g
e branc
h
'jm
/
m
a
int-1
.
6
.
5-gr
e
p-NUL
-
terminate
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Ji
m
M
e
y
er
i
n
g
grep: NUL
terminate inpu
t
from a file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Andrea
s
Gruenbacher
b
u
i
l
tin
-
apply
.
c
:
Skip f
i
l
e
names without enough com
p
onents
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C Hamano
sy
m
links
.
c: remove unused
f
unction
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
object
.
c
: remov
e
unu
s
ed
f
unctions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
Document that merg
e
strategie
s
can now
t
a
ke their own
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery
P
ennarun
Extend merge-subtree tests to te
s
t -Xsubtr
e
e=di
r
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C
Hamano
Make
"
subtree" part more
orthogonal
to the rest of
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ju
n
i
o
C Hamano
pull: Fix pa
r
sing
of -X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Avery Pennarun
Teach gi
t
-p
u
ll
t
o
pass -
X
<option> to git-merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y
P
ennaru
n
git
m
er
g
e
-
X<option>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
Update draf
t
r
el
e
as
e
n
otes to 1
.
7
.
0
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-18
Junio
C H
a
mano
Merge branch
'
tc/test-locate-ht
t
pd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C Ha
m
ano
Merge
branch 'jh/comm
i
t
-sta
t
us'
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
amano
Merge
b
ranch
'
j
n/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Merge
branch 'j
c
/m
a
int-1
.
6
.
1-ch
e
ckout-m-cu
s
tom-mer
g
e'
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Haman
o
Me
r
ge branch 'tc/clone-v-progr
e
ss'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
a
m
ano
Merge bra
n
ch
'tc/smart-htt
p
-
r
estrict'
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C H
a
m
a
no
Merge branch 'jk/r
u
n-command-use-shell'
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C Hama
n
o
Merge branch 'sr/gfi-optio
n
s'
commit
|
commitdiff
|
tree
2010-01-17
Jens Lehmann
git status: Show unc
o
m
m
itted submodu
l
e changes too
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
Update
COPYING with GPLv2 wit
h
new FSF address
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
ser_ident_su
f
ficiently
_
g
iven(): re
f
actor the logic
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
u
s
er_iden
t
_sufficie
n
tl
y
_
given():
refactor the log
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Ham
a
no
r
e
rere: hono
r
conflic
t
-mar
k
er-size attribute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Ham
a
no
rere
r
e: prep
a
re for cu
s
tomizable
con
f
lict marker le
n
gth
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
ma
n
o
commit
.
c::print_s
u
mmar
y
: do
not release the
format
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
conf
l
ic
t
-mark
e
r-size:
n
ew attri
b
ute
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jun
i
o
C
H
ama
n
o
rerere: use
ll_merge
(
) instead of using xdl_me
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C
H
amano
merge-tree: use ll_m
e
rg
e
() no
t
xdl_mer
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xdl_merge(): a
l
low passing down marker
_
si
z
e
in xmparam_t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C
Hama
n
o
xdl_merge(): introdu
c
e xm
p
aram_t for merge specif
i
c
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
unio C Hamano
git_attr(
)
: fix function signature
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Si
x
t
Do not use dat
e
.
c:tm_
t
o
_time
_
t() from comp
a
t/mingw
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Andr
z
ej K
.
H
acze
w
ski
M
SVC:
Windows-native implemen
t
ation f
o
r subset of Pthreads API
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ha
m
ano
M
erge branch
'm
a
int'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hama
n
o
Merge branch
'
c
c
/
r
eset
-
more
'
commit
|
commitdiff
|
tree
2010-01-17
Ramkumar Ramacha
n
dra
D
ocu
m
e
ntation:
Upda
t
e git
core tutorial clar
i
f
ying
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ramsay Jones
M
SVC:
F
i
x an "i
n
compatible
pointer types" comp
i
ler
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johannes Sixt
Windows: avoid t
h
e "dup dance" when spawning a ch
i
ld
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jo
h
a
n
nes Sixt
Wi
n
d
ows: simp
l
ify the pipe(2) implementation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Johann
e
s Sixt
Windows: boost startup by a
v
oidi
n
g a st
a
tic dependency
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
E
rik Faye-Lund
Window
s
: disable Python
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
io C Hamano
Te
a
c
h
d
i
f
f
that modified
s
ubmodule directory is
dirty
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Jens
Lehm
a
nn
Show sub
m
odules as m
o
dif
i
ed when they cont
a
in a dirty
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-17
Ilari Lius
v
aara
Add push --set
-
u
p
stre
a
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
C
hristi
a
n Couder
t7111: fix b
a
d HEAD
in tests
with unmerged
e
n
t
ries
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
David
A
g
u
ilar
difftoo
l
: Update copyright notices t
o
list
e
ach
ye
a
r
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Richard Weinberger
F
i
x
u
ninit
i
alize
d
varia
b
l
e
in get_refs_via_
r
s
ync()
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
Tarm
i
gan Casebolt
Test
t
556
0
: Fix test w
h
en run
with da
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-16
N
g
uyễn
T
há
i
Ngọ
c
D
uy
st
a
t
u
s: o
n
ly touch path we ma
y
need
to check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
d
i
fftoo
l
: Use eval to
e
xpand '--extc
m
d'
e
xpres
s
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Agu
i
la
r
difftool: Add '-
x
' an
d
as an alias
for '--extc
m
d'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
David Aguilar
t7
8
0
0
-difftool
.
sh: Simpli
f
y
t
he --extcmd test
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
Junio C Ham
a
no
grep
-
-no-index: a
l
low
u
se o
f
"git grep" o
u
t
s
i
d
e
a
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
J
unio C Hamano
grep: prepare to ru
n
outside of a
work tree
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
R
a
m
k
u
mar Ramachandra
Docume
n
t git-
b
lame tri
p
le -C option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-15
D
mitry Potapov
fas
t
-
i
mport: tag m
a
y point to any object typ
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff K
i
ng
commit: allow suppressio
n
of im
p
licit identity advice
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
c
o
mmit: show interestin
g
ide
n
t informati
o
n i
n
s
ummar
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff
King
strbuf: ad
d
s
t
r
b
u
f
_
addbu
f
_percent
q
uot
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
strb
u
f_expand: co
n
v
e
rt "%
%
" t
o
"%"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael H
a
g
g
erty
r
e
base -i: R
e
tain
u
se
r
-edited commit me
s
sages after
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
t
340
4
:
Set u
p
mor
e
of the test repo in the "setup"
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagge
r
ty
rebase -
i
: For
f
ixup commands withou
t
s
q
u
ashes, do
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael H
a
g
g
erty
rebase -i:
C
h
ange function make_
s
quash_
m
e
ssage into
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michae
l
Haggerty
r
e
bas
e
-i: Extract funct
i
o
n
do_w
i
t
h_au
t
hor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hag
g
erty
rebase -
i
: Handle the au
t
h
o
r sc
r
ipt all in one place
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ich
a
el
H
agge
r
ty
rebase -i
:
E
xtr
a
ct a
function
"
c
ommit_
m
essag
e
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
rebase -i: S
i
mplify commit
counting for
g
en
e
rated commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
ichael Haggerty
rebase
-i: Impro
v
e
c
onsistency of com
m
it count in gene
r
ated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Micha
e
l Haggerty
t3404: Te
s
t t
h
e commit count in commit
mess
a
ges generated
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hagger
t
y
rebase -i:
Introduce a
constan
t
AMEND
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
H
a
ggerty
r
ebase -
i
: Introduce a
c
o
n
s
tant A
U
THOR_SC
R
IPT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hag
g
er
t
y
r
e
b
ase -i
:
D
ocum
e
nt how temp
o
rary files are
u
sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael
H
aggert
y
rebase -i: Use
s
ym
b
olic const
a
nt $MSG con
s
istent
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ael Hagge
r
ty
rebase
-
i: Us
e
"test -n" instead of "test !
-
z"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Ha
g
g
e
r
ty
rebase -i: Inline expression
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
rebase -i
:
Remov
e
de
a
d code
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-14
M
i
c
h
ael Haggerty
reba
s
e -i: Ma
k
e
the condition for an "if" more tra
n
sparent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-01-13
Junio C Hamano
Merge branc
h
'jc/checkout-merge-base'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C
Hamano
Merge branch 'rs/maint
-
archive-match-pathspec'
commit
|
commitdiff
|
tree
2010-01-13
Junio
C Hama
n
o
Merge b
r
anch 'il/vcs-helper'
commit
|
commitdiff
|
tree
2010-01-13
Junio C Ham
a
no
strbu
f
_
addbuf(): allo
w
pas
s
ing the same buf
to dst
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next