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
Documentation: clarify 'ours' merge strategy
2009-11-15
T
h
omas
R
a
st
D
ocumen
t
ation
:
cl
a
rify 'ours' merge strategy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-10
Junio C Hamano
G
I
T
1
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-10
Sim
o
n Arlo
t
t
git
-
sv
n
: hi
d
e find
_
parent_branch output in double quiet
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-10
Jonathan Niede
r
D
ocum
e
ntation: cl
o
n
e:
c
l
a
rify dis
c
u
s
si
o
n of initial
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Junio C
Hamano
Merge branch
'
rs/maint-archive-
p
refix'
commit
|
commitdiff
|
tree
2009-10-09
J
u
nio C Hamano
M
erge branch 'fc/mutt-alias'
commit
|
commitdiff
|
tree
2009-10-09
J
unio C Hamano
Mer
g
e b
r
anch '
e
f/ms
v
c-noreturn'
commit
|
commitdiff
|
tree
2009-10-09
Junio C Hama
n
o
Merge branch 'jk/reflog-date'
commit
|
commitdiff
|
tree
2009-10-09
Junio
C H
a
mano
Merge bra
n
ch '
c
h/am-head
e
r'
commit
|
commitdiff
|
tree
2009-10-09
B
j
ö
r
n Gust
a
vss
o
n
bash
:
add support for
'
g
i
t
replace'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Stephen
B
oyd
completion:
f
ix alia
s
listings with ne
w
li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Stephen Boyd
completion:
f
i
x
c
omplet
i
o
n of git <TAB
>
<T
A
B>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Ing
m
a
r Vanhassel
im
p
ort-tars: Add m
i
ssing clos
i
ng
brack
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
J
o
n
athan N
i
eder
r
a
c
y-git
.
t
x
t: explain nsec problem in mo
r
e detail
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nieder
Docum
e
ntat
i
on: clarify "working
t
r
e
e" d
e
fi
n
ition
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jo
n
at
h
a
n
Nieder
Documenta
t
ion: cla
r
ify branc
h
creation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jon
a
th
a
n
N
ieder
Document
a
t
ion
:
bra
n
ch: update --merged descriptio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
J
o
nathan Nied
e
r
Documentation
:
clarify mergeoptions
d
escri
p
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonath
a
n Nieder
Documen
t
ation: g
i
t fmt-merg
e
-msg does not
have to
b
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Jonathan Nied
e
r
De
s
cribe
D
OCBOOK_X
S
L_172, ASCIIDOC_
N
O_ROFF
op
t
io
n
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
J
eff
K
i
ng
pull: impr
o
ve a
d
vice for u
n
c
o
nfigu
r
ed error c
a
se
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
J
unio
C
Hamano
M
e
rg
e
git://git
.
b
o
gomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2009-10-09
Junio C Hamano
Merge b
r
anch
'ms/msvc'
commit
|
commitdiff
|
tree
2009-10-09
Ju
n
i
o
C Ha
m
ano
Update draft release notes to 1
.
6
.
5
commit
|
commitdiff
|
tree
2009-10-09
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-10-09
Bra
n
don C
a
sey
Makefile:
a
d
d
a note about
the NO_MMAP setting on
I
RIX
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Ben Wa
l
ton
ls-files:
die instead
of fprint
f
/exit in -i error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Bran
d
o
n Cas
e
y
Ma
k
efile: enable THREA
D
E
D
_DELTA_SEARCH o
n
IRIX and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
R
amsa
y
Jones
Fix the ex
i
t code of M
S
VC
build scripts on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
Rams
a
y Jones
Fi
x
MSVC build on cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-09
René Scharf
e
Git archive and
t
railing
"
/"
i
n pref
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-08
Stephe
n
B
o
y
d
completion: add dirstat and fri
e
nds to diff options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-08
Stephen Boyd
completion:
u
pdate am, commit, and log
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-08
Brandon
C
a
s
e
y
Makefile: enable THRE
A
DE
D
_DELTA_SEA
R
CH on
S
unO
S
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-08
Junio C Hamano
M
e
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2009-10-07
J
u
n
io
C
Hamano
fas
t
-impo
r
t
.
c::valid
a
te_raw_date
(
): really validate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-07
S
t
efan Naewe
README
:
git live
s
at
h
ttp://g
i
t-scm
.
com th
e
se days
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-05
Junio
C Hamano
git-pul
l
: dead code removal
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-10-04
Ju
n
i
o C Hamano
Merg
e
branch 'm
a
int'
commit
|
commitdiff
|
tree
2009-10-04
Junio C
H
a
m
ano
M
erge branch 'jc/maint-1
.
6
.
4
-show
-
br
a
nch-de
f
ault' into
.
.
.
commit
|
commitdiff
|
tree
2009-10-04
Ju
n
io
C Hama
n
o
sh
o
w
-branch: fix s
e
gfau
l
t when show
b
ran
c
h
.
defa
u
lt exists
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-23
Juni
o
C Hamano
pul
l
:
Clarif
y
"help
f
ul"
message for another c
o
rn
e
r
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-23
Th
i
ago Farina
Update "describ
e
" documen
t
ation
t
o
match reality
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-22
SZEDE
R
Gáb
o
r
bash:
t
each 'git r
e
set --patch'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-22
SZED
E
R Gábor
bash: update 'g
i
t
stash'
c
om
p
letion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-22
SZEDER G
á
bor
bash
:
rename
_
_git_find_subcommand() to
_
_g
i
t_find
_
on_cmdlin
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-22
Junio C Haman
o
pay attention to DESTDIR when building with NO
_
PERL
_
MAKE
M
AKE
R
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-22
Jim M
e
yering
pre-commit
.
sample: add comment re tr porta
b
ility; fix
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-22
Junio C Hamano
U
pdate
R
e
leas
e
Notes to 1
.
6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-21
Johan
n
e
s
Sixt
test-genrandom: ens
u
re stdout is s
e
t to _O_BINARY
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-21
Junio
C Hamano
Merge
git://git
.
kernel
.
org
/
pub/sc
m
/
g
itk/gitk
commit
|
commitdiff
|
tree
2009-09-20
Jun
i
o C Hamano
M
erge b
r
anc
h
'
maint'
commit
|
commitdiff
|
tree
2009-09-20
Matthi
e
u Moy
push: Correctly initialize nonf
a
stf
o
r
w
ard in
transport_
p
u
s
h
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Ma
r
i
us Storm-Olsen
T
a
g
G
IT_VERSIO
N
when Git is
b
uilt with MS
V
C
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
M
a
r
ius Storm-Olsen
Add scripts to generate projects for other buildsystems
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Marius S
t
or
m
-Ols
e
n
Add README for
MSVC
b
u
ild
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Marius Storm-Olsen
A
d
d
MSVC
t
o Makefile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
M
arius S
t
orm-Olsen
D
e
fine strncasecmp and ftr
u
ncate for MSVC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
M
arius Storm-Olsen
M
a
k
e usa
g
e of wi
n
dows
.
h lean
and mean
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
Add platform files
f
or porti
n
g to MSVC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
F
rank Li
Add
MinGW
h
ea
d
e
r
files to bui
l
d git
w
ith MSVC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Marius S
t
orm-Olsen
Ad
d
empty
h
e
a
der f
i
l
e
s
f
or MSVC port
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
T
e
st f
o
r
WIN32 ins
t
ead of __MINGW32_
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Fra
n
k
Li
Fix __stdca
l
l
placement and function prototype
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Mar
i
u
s
Sto
r
m-O
l
sen
Set _O
_
BINAR
Y
as
d
efau
l
t fmode for both
M
i
nG
W
and MSVC
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
F
rank Li
C
h
ange
regerror() decla
r
at
i
on from K&R style to ANSI
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Marius Storm-Olsen
Add
i
nclu
d
e guar
d
s to compat/win3
2
.
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Frank Li
Avoid decla
r
a
t
i
o
n
a
f
t
er stat
e
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Thiago
F
ari
n
a
pack-objects: rem
o
v
e SP at the end
o
f usage
str
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-19
Thiago Farina
Update the usa
g
e bund
l
e string
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-17
Cleme
n
s Buchache
r
cv
s
:
initialize empty
p
assword
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-16
Junio
C
Hamano
M
erg
e
1
.
6
.
4
.
4 in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-16
Junio C Hama
n
o
GIT
1
.
6
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-16
Junio C
H
a
m
ano
Merge branch
'
jc/
m
aint
-
un
p
a
ck-obj
e
cts-stri
c
t
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Ju
n
io
C
Ham
a
no
Merge
branch '
t
f/diff-white
s
pace-i
n
co
m
plete-line'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Junio
C Hamano
Merge
b
ranch 'jk/
m
ai
n
t-
1
.
6
.
3-checkout-unborn' into
.
.
.
commit
|
commitdiff
|
tree
2009-09-16
Junio C Hama
n
o
Merge branc
h
'jc/m
a
i
n
t
-
checkout-ind
e
x-to
-
prefix
'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2009-09-14
Ju
n
io C Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2009-09-14
Jun
i
o
C Ha
m
ano
Merge branch 'rc/m
a
i
nt-http-no
-
hea
d
-pack-check' int
o
.
.
.
commit
|
commitdiff
|
tree
2009-09-14
Junio C Hamano
http
.
c
:
avoid f
r
e
e
ing an unini
t
i
alized point
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-14
H
eiko Voigt
web--bro
w
se: f
i
x
Ma
c
O
S X GUI detection
for 1
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-14
Heiko Voigt
remove logical ty
p
o i
n
documenta
t
ion of sa
m
p
l
e up
d
ate
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-14
Nicol
a
s Pitre
N
i
colas Pitre
has a new email address
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Dmitry P
o
tapov
git-ar
c
hive:
infer output
format fr
o
m filen
a
m
e when
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Todd Zullin
g
e
r
co
m
pletion: Repl
a
ce confi
g
--list wit
h
--get-regexp
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Dmitry P
o
tapov
git-arc
h
ive: add
'-o' as a alias for '--ou
t
p
ut
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Clem
e
n
s B
u
chache
r
test l
o
cal clon
e
by
c
opying
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Johannes Gilg
e
r
g
i
t-
c
l
o
ne doc: typofi
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Nelson Elhage
git-p
u
sh: Accept -n
a
s a syno
n
ym for --dry-run
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hamano
git-c
o
mm
i
t doc: remove duplicated --dr
y
-run description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Jun
i
o C Hama
n
o
GIT 1
.
6
.
5
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Ja
r
i Aalto
I
m
p
rove --patch optio
n
documentation in gi
t
-add
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Junio C
Hama
n
o
Mer
g
e
b
r
a
nch 'p
k
/fast-impo
r
t-
t
a
rs'
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hamano
Merge branch 'pk/fast-impo
r
t-dirs'
commit
|
commitdiff
|
tree
2009-09-13
Jun
i
o C Hamano
Me
r
ge
bran
c
h
'jt
/
pushin
s
te
a
dof
'
commit
|
commitdiff
|
tree
2009-09-13
Junio C Hamano
Merge branch '
j
k/unwanted-a
d
v
i
ces'
commit
|
commitdiff
|
tree
2009-09-13
Junio C
Hamano
Merge branch 'jc/merge-saner-messages
'
commit
|
commitdiff
|
tree
2009-09-13
Juni
o
C Hamano
quiltimp
o
r
t docu
m
e
n
tation: --dry-run and -n ar
e
synon
y
m
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Clemens Buch
a
cher
p
reserve
m
tim
e
of local clone
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-09-13
Jim Meyering
don
'
t dereference N
U
L
L
upon f
d
open f
a
ilure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next