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
filter-branch: Fix to allow replacing submodules with another content
2010-01-20
Juni
o
C
Hamano
Merge
br
a
nch 'dp/maint-1
.
6
.
5
-
f
ast-impor
t
-non
-
commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio C Ham
a
n
o
M
e
r
ge bran
c
h 'jm/maint-1
.
6
.
5-
g
rep-NUL-te
r
minate' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-01-20
Junio
C Hamano
Teach @{upstr
e
a
m} syntax to strbuf_
b
ra
n
chanme()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
t1506: more test for @{upstrea
m
}
synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
J
u
nio
C
Hamano
Fix "checko
u
t
A
.
.
.
"
synonym
fo
r
"checkout A
.
.
.
H
EAD
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio C Hamano
status:
d
on't re
q
uire t
h
e
r
epository to be writabl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-20
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-19
J
o
hannes
S
ixt
Makefil
e
: h
o
nor NO_
C
URL when
s
etting REMOTE_CURL_*
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
T
armigan Cas
e
bolt
id
e
nt
.
c
: replace fprintf w
i
th fputs to suppress
c
ompiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Nguyễn
Thái Ngọc Du
y
r
m
: only r
e
fresh entries that we m
a
y
t
o
uch
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
David Ri
p
ton
bisect: fix
si
n
gular/plural
g
rammar
n
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ben Walton
cvsimport: s
t
andarize s
y
stem() calls to
e
x
ternal gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
B
e
n Walton
cvsimport: standarize
o
pen(
)
calls
t
o external git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Be
n
Wal
t
on
c
v
s
import: modernize
c
allou
t
s to git su
b
co
m
mands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
g
e
b
ranch 'main
t
-1
.
6
.
4' into
m
aint-1
.
6
.
5
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge b
r
anch
'maint-
1
.
6
.
3
' into
m
a
i
n
t-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Merge branch
'
m
a
int-1
.
6
.
2' into m
a
int-1
.
6
.
3
commit
|
commitdiff
|
tree
2010-01-19
J
uni
o
C Hamano
M
erge commit '
v
1
.
6
.
4
.
4-8-g8de6518
'
into maint-1
.
6
.
4
commit
|
commitdiff
|
tree
2010-01-19
Ju
n
io C Hamano
Fix mis-backport
of t70
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Ham
a
no
Update draf
t
releas
e
no
t
e
s
t
o
1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Update draft
release notes to 1
.
6
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
J
u
n
i
o C Haman
o
Mer
g
e branch 'dp/maint-1
.
6
.
5-fast-i
m
port-n
o
n
-commit
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hamano
Merg
e
branch 'jc/rerere'
commit
|
commitdiff
|
tree
2010-01-19
Junio
C
Hama
n
o
M
erge branch 'pc/uninte
r
esting-submod
u
l
e-disappear
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
J
unio C
H
amano
Merge branch 'nd/include
-
termios-for-osol'
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
M
e
r
g
e bran
c
h 'js/windows'
commit
|
commitdiff
|
tree
2010-01-19
Mat
t
h
ieu Moy
b
r
anc
h
: warn
a
nd re
f
use to set a branch as
a track
i
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Jens L
e
hmann
Performa
n
c
e
optimiza
t
ion for de
t
ect
i
on of modified
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ilari Liusvaa
r
a
Add branch --
s
e
t
-upstre
a
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Andreas G
r
uenbacher
b
u
iltin-apply
.
c: fix the ---
and +++ h
e
a
d
er filenam
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Ilari
L
iusvaara
Add git remote set-url
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Daniel Ba
r
kalow
R
e
pl
a
ce parse_blob() with an
e
x
planatory comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-19
Junio C Hamano
Merge branch 'jm/m
a
int-1
.
6
.
5-
g
re
p
-NUL-t
e
rminate
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-01-19
Jim Meyering
grep: NUL terminate input
f
r
om a fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Andreas Gr
u
enb
a
cher
builtin-apply
.
c: Skip filenames wi
t
h
out enough components
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
H
amano
symlinks
.
c: remove u
n
u
s
ed f
u
nctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
mano
o
b
ject
.
c:
r
emove unused fu
n
ctions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Hamano
Document that merge
s
trateg
i
e
s
c
a
n now ta
k
e
thei
r
own
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
Extend
m
e
rge-subtree tests to te
s
t -Xs
u
btree=di
r
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Juni
o
C Hamano
Make "subtree"
part more orthogonal to the rest
o
f
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C
H
amano
pull: Fix
parsing of -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Ave
r
y Pennarun
T
e
ach git-pu
l
l
t
o
pass -X<option> to git-merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
A
very Pennarun
g
i
t
m
e
rge -X<option>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
Junio C Haman
o
Update draft re
l
ease notes to 1
.
7
.
0
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-18
J
unio C
Hamano
Merge bra
n
c
h 'tc/test-locate-
h
t
tpd'
commit
|
commitdiff
|
tree
2010-01-18
Junio C H
a
ma
n
o
Merge bra
n
ch 'jh/com
m
i
t
-
status
'
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio C Hamano
Mer
g
e branch 'jn/makefile'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e branc
h
'
jc/m
a
i
nt-1
.
6
.
1-chec
k
out-m-cust
o
m-merge'
commit
|
commitdiff
|
tree
2010-01-17
Junio C H
a
m
ano
Mer
g
e
branch 'tc
/
clone-
v
-
progres
s
'
commit
|
commitdiff
|
tree
2010-01-17
J
unio
C
H
ama
n
o
Merge branch 'tc/sma
r
t-
h
ttp-restrict'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Mer
g
e b
r
anch 'jk/run-comm
a
n
d
-use-s
h
ell'
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C H
a
m
a
no
M
e
rge branch 'sr
/
gfi-options'
commit
|
commitdiff
|
tree
2010-01-17
J
e
ns Leh
m
ann
git stat
u
s:
S
h
o
w un
c
ommitted submod
u
le changes to
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
Update COPYI
N
G
w
i
t
h
G
PLv2 with
n
ew
FSF address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
Hamano
user_ident_suffic
i
ently_given(): refac
t
or
t
he logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
nio
C
Hamano
user_
i
d
ent_s
u
fficientl
y
_
g
ive
n
(): refacto
r
the logic
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
rer
e
r
e: honor co
n
flic
t
-marker-size attribute
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
a
mano
rerere
:
p
r
epare for customizabl
e
conflict marke
r
len
g
th
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
commit
.
c::print_
s
ummary: do
not release the form
a
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio
C
H
amano
conflict-marker
-
size: new
a
ttri
b
u
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io
C Hama
n
o
rere
r
e
:
u
s
e ll_merg
e
() instead of
u
si
n
g
xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
u
n
i
o C Hamano
merge-t
r
ee
:
u
s
e
ll_merg
e
() n
o
t xdl_merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Ham
a
no
xdl_merge(): a
l
low passing down m
a
rker_size i
n
xmpara
m
_t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
xd
l
_merge
(
): introdu
c
e
x
mpar
a
m_t f
o
r
m
e
r
ge specif
i
c
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Juni
o
C
H
aman
o
gi
t
_at
t
r():
f
i
x
function sig
n
a
ture
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
J
o
hannes S
i
xt
Do
not use dat
e
.
c
:
t
m
_to_time_t() fro
m
compat/
m
ing
w
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Andrzej K
.
Ha
c
z
e
wski
MSVC: Windo
w
s-
n
a
tive implementatio
n
for
subset o
f
Pthr
e
a
d
s
A
PI
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Junio C
H
ama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-01-17
Junio C Hamano
Me
r
ge branch 'cc/reset-mo
r
e
'
commit
|
commitdiff
|
tree
2010-01-17
R
a
mk
u
mar
R
amachandra
Docu
m
ent
a
tion:
Update g
i
t c
o
re tut
o
rial clarifying
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Rams
a
y
Jones
MSVC: Fix an "incompat
i
b
le point
e
r types" compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johanne
s
Sixt
W
i
n
d
ows: av
o
id
t
he "dup da
n
ce" when spawning a
c
hild
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Joha
n
nes Sixt
W
indows: simp
l
ify
t
he pipe(2
)
implemen
t
atio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Johannes S
i
xt
Windows: boost sta
r
tup
b
y avoiding
a
static de
p
endency
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Eri
k
Faye-Lund
Windows: di
s
able Python
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ju
n
io C Hamano
Teach d
i
ff that modifi
e
d submodule
d
irectory
is di
r
ty
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
submodules as mo
d
ified
w
hen they contain a dirty
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-17
Ilari Liusvaara
Add p
u
sh
--set-upstream
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-16
Christian Couder
t7111
:
fix bad HE
A
D
i
n tests with unme
r
ged entries
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-16
Dav
i
d
A
guilar
diffto
o
l: Update copyri
g
ht
n
o
t
ices to
list e
a
ch year
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-16
Richar
d
Weinber
g
er
Fix uni
n
itia
l
i
z
ed variabl
e
in
get_refs_
v
ia_rsync(
)
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-16
T
a
rmigan
C
a
sebolt
Test t5560: Fix test
when run with dash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-16
Nguyễn Thái N
g
ọc Duy
status: only
t
o
uch path w
e
may need t
o
check
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
David A
g
uilar
di
f
ftool: Use eval to
expa
n
d
'--extcmd
'
expr
e
ssions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguil
a
r
diff
t
oo
l
: Add '-x'
a
n
d as an alias
fo
r
'--extcmd'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
D
avid Aguilar
t7800-
d
if
f
to
o
l
.
sh
:
Si
m
plify the --extc
m
d test
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Jun
i
o C Hamano
grep
-
-no-ind
e
x: allow use
o
f
"g
i
t grep" outsi
d
e a
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Junio C
H
amano
grep:
p
re
p
are to run out
s
ide of
a work
t
ree
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Ramkumar Ramachan
d
ra
Do
c
ument
g
it-blame triple -C option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-15
Dmitry Potapov
fast-
i
m
port: tag may poin
t
to a
n
y o
b
ject t
y
pe
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
J
e
f
f King
commit
:
allow suppres
s
ion of implicit identity advice
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
c
o
mm
i
t
:
s
how interesting ident information in summary
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
s
t
rbuf: add strbuf_addb
u
f
_percentquote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Jeff King
s
trb
u
f_expand
:
con
v
e
r
t "%%" to "
%
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael Haggerty
r
e
base
-
i
:
Retain
user-edi
t
ed commit messages aft
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
M
ic
h
ael Ha
g
gerty
t3404: Set up more of the test
re
p
o in
t
he "s
e
tup"
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael H
a
ggerty
reba
s
e
-
i
: For fix
u
p commands wit
h
out squa
s
h
e
s, do
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Michael Hag
g
erty
rebase -
i
: Cha
n
ge function
m
ake_squash_message into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-01-14
Mic
h
ae
l
Hagge
r
ty
r
ebase -i:
Extract function do_
w
ith_author
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next