repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
2010-08-06
Jonathan N
i
ed
e
r
Allo
w
"
che
c
k-ref-f
o
rmat --branch" fr
o
m
s
ubdir
e
ctory
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-08-06
Jona
t
ha
n
Nie
d
er
check-ref-fo
r
mat
:
handle subcommands in sep
a
rate func
t
ions
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-27
Jonath
a
n Nieder
config --get --path
:
check for unset $HOME
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-21
Jonathan
Nieder
t/READ
M
E: correct an exceptio
n
when
b
reaking a && chain
.
.
.
commit
|
commitdiff
|
tree
2010-07-16
Jonathan
N
ieder
Add a
s
amp
l
e use
r
for the svndump library
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
Documentatio
n
:
a
dd submodule
.
* to
t
h
e big c
o
nfigur
a
tion
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-15
Jonathan Nieder
gitm
o
dules
.
5: ur
l
ca
n
b
e a relat
i
ve
path
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-14
Jonathan
Nieder
g
it --paginate: p
a
gi
n
ate e
x
ternal comma
n
ds ag
a
in
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-12
J
onathan Nieder
t3000 (
l
s-files -o):
m
odernize style
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-08
Jonathan Nieder
t9
1
18 (git-svn)
:
prevent
e
a
r
ly failu
r
e
from taking
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-07-07
Jona
t
han Nieder
t/README: document more test hel
p
ers
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-29
Jonathan Nieder
revert:
do not reb
u
ild argv on heap
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
J
o
nathan Ni
e
der
t
e
sts: loca
l
config
file s
h
ould be
h
onored from
s
ubdirs
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t7006
:
t
est pager
con
f
igur
a
tion for seve
r
al
g
it commands
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-28
Jonathan Nieder
t70
0
6
(pager):
introduce helper for paramet
e
rize
d
tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
Jon
a
than N
i
ede
r
t3508 (che
r
ry-pick): futureproof against unm
e
rged file
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-14
J
onathan Nieder
g
i
t-svn: s
t
r
ip of
f
l
eadi
n
g slashes
o
n --trunk argument
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jonathan
N
ieder
a
dd-interactive: Cla
r
ify
“remaining hunks
i
n t
h
e file”
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-13
Jo
n
athan Nieder
gr
e
p:
refactor grep_objects
lo
o
p into its own fun
c
tion
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jonatha
n
Nieder
Doc
u
mentation/ch
e
c
k
o
ut:
clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-11
Jon
a
than Nied
e
r
reba
s
e -i -p:
d
ocument shortcomings
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-02
Jonathan Nieder
DWIM 'git sh
o
w
-
5' to 'gi
t
show --do
-
walk -5'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonatha
n
Nieder
gitig
n
ore
.
5: Clarify matching rules
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonathan Nieder
rebase
:
i
m
p
rov
e
error message
w
hen upstream argument
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-06-01
Jonath
a
n Nieder
Documentation/
c
heckout: clarify description
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-28
Jonathan Nieder
fsck: fix b
o
g
u
s commit he
a
der check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
athan Nieder
Add
g
it remote se
t
-branc
h
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-20
Jo
n
atha
n
Nieder
po
s
t
-
r
e
c
e
ive-e
m
ail: document command-lin
e
mode
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nied
e
r
g
it s
v
n: avoid unin
i
tia
l
iz
e
d
var
i
n
'
rese
t
'
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan
N
ied
e
r
Makefile: let hea
d
er dependency checker over
r
ide COMPUTE
_
HEA
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
M
a
k
efi
l
e: fix h
e
ader d
e
pend
e
ncy chec
k
er t
o
allow NO
_
CURL
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Documentation/notes: nitpicks
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonathan Nieder
Doc
u
me
n
ta
t
ion/notes: cl
e
a
n
u
p
description of rew
r
iting
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
o
nathan Nieder
Documen
t
ation/n
o
tes:
s
implify tre
a
tment of default
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Documentation
/
log: add
a
CONFI
G
URATION
s
ection
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
J
onathan Nieder
Documentat
i
on/n
o
tes: simplify treatment of d
e
fault
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jon
a
t
han Nie
d
er
Documentat
i
on/notes: add con
f
iguration
section
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jona
t
h
an Nieder
D
o
cumentation/notes: describe
content of
n
otes
b
lo
b
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-09
Jonat
h
a
n
Nieder
Documentation/no
t
e
s
:
document form
a
t of
n
o
tes tre
e
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Ni
e
der
cherr
y
-p
i
ck: do not
d
ump
c
ore when iconv f
a
ils
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
J
onathan N
i
eder
pret
t
y: initialize new cmt_fmt_map to 0
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-08
Jonathan Nieder
adapt request-
p
ull tests for
n
e
w
p
u
l
l
request forma
t
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-06
Jonathan Nieder
test-lib:
some shells do not
l
e
t
$
?
propagate into
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Nied
e
r
shortl
o
g: Doc
u
ment and test --format option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan
N
i
ed
e
r
t4201 (shortlog): Test
o
utput form
a
t
with multip
l
e
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jon
a
than
N
ieder
t4201 (shor
t
log): gua
r
d setup with t
e
st
_
expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
Doc
u
mentatio
n
/sho
r
tl
o
g
:
scripted users should not
r
ely
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jona
t
han Ni
e
der
commit --a
m
end: cope with missin
g
display name
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-04
Jonathan Nieder
t
e
s
t
-lib
:
Let
t
ests specify com
m
ands to b
e
run at end
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
J
onat
h
an
N
ieder
fsck: check
ident lines in commit objects
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jonath
a
n Nieder
reques
t
-pull: prote
c
t
a
ga
i
nst OPT
I
ONS_KEEPD
A
SHDASH
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-05-01
Jona
t
han Nieder
tes
t
s
for request-pull
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-22
Jonathan Nieder
Docume
n
tation/Makefile: fix interrupted builds o
f
user
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jonathan Nieder
fix "bundle -
-
stdin
"
segfault
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-20
Jona
t
h
a
n
N
i
eder
t5704 (b
u
ndle)
:
a
d
d tests for b
u
nd
l
e --stdi
n
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-17
Jonath
a
n Ni
e
der
tag -v: use RUN_GIT_
C
MD t
o
run verify-tag
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
J
o
nat
h
an N
i
eder
Docum
e
nt
new "already-me
r
g
e
d" rule for branch -d
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan Ni
e
d
e
r
Add
.
depend directories to
.
g
it
i
gnore
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-15
Jonathan
N
i
e
d
e
r
t7006
:
gua
r
d cleanup w
i
th test_expect_success
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-13
Jonathan N
i
eder
t5800: test
g
it helper requ
i
res Pyth
o
n
s
u
pport
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonatha
n
Nieder
t7
4
00: clarify s
u
b
modul
e
update
te
s
ts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Nied
e
r
t7400: cl
a
rify 'submodule a
d
d' tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-11
Jonathan Ni
e
d
e
r
t7
4
00:
split set
u
p into mult
i
ple tests
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
ath
a
n Nieder
Te
a
ch
maili
n
fo %
<
as an alte
r
native s
c
issors
m
a
r
k
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makef
i
l
e: future-pr
o
of Cygw
i
n version check
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursi
v
e
:
add a lab
e
l for
a
ncesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
cherry-pick, revert: add a
label for
ance
s
tor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
reve
r
t: cla
r
ify l
a
b
e
l on conflic
t
hun
k
s
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
than Niede
r
c
o
mpat: add mempcp
y
()
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nie
d
e
r
checkou
t
-m --conflict=diff
3
:
add a lab
e
l for ancestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
m
e
rge_trees(): add ancest
o
r label p
a
r
ameter for
d
iff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_fil
e
(): add comment explaining behavior wrt confl
i
ct
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@mgila.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
checkout --con
f
lict=diff3: ad
d
a label for a
n
cestor
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
N
ieder
ll_merge(
)
:
add ance
s
t
o
r
l
a
b
el
par
a
meter for diff3
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file --diff3: add a
label for ancesto
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan
Nieder
xdl
_
merge(): move file1
a
nd file2 l
a
bels to xmparam
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
de
r
xdl_m
e
rge(): add optional ancestor label to diff3-
s
t
y
le
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
t
ests: document c
h
erry
-
p
i
ck behavior in face of conflicts
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
t
e
sts: documen
t
format of conflicts
from ch
e
ckout -m
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
h
a
n Ni
e
d
e
r
revert: fix
t
iny memory l
e
ak i
n
cher
r
y-pick --ff
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
Nie
d
er
Makefile: Fix
occ
a
sio
n
al GIT
-
C
F
LAGS bre
a
k
ag
e
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
a
than Nie
d
er
Mak
e
file: Fix CDPATH problem
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan N
i
eder
gi
t
k
: D
o
n
't clobb
e
r "Remem
b
e
r
this view" setting
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Ni
e
der
gitk: Add comme
n
t
s
to explain encode_view_opts and
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-28
Jonathan Ni
e
d
er
Makefile:
c
larif
y
definition of TES
T
_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-23
Jonatha
n
Nied
e
r
am: re
m
o
ve r
e
b
ase-apply directory before
g
c
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-22
Jonathan Nied
e
r
t
es
t
s: Fix race condition in t7006-page
r
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan N
i
eder
t7
0
06-pager: if stdout is not a terminal, ma
k
e a new one
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-20
Jona
t
han Nied
e
r
tests
:
Add t
e
sts f
o
r automatic
u
se of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nied
e
r
am: Fix l
a
u
nch
i
ng of pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Ni
e
de
r
g
i
t sv
n
: Fix la
u
nching o
f
pager
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jon
a
than
Nied
e
r
git
.
1:
Clarify
th
e
behavior of the --pagi
n
ate option
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan Nieder
Make 'gi
t
var GIT_PAGE
R
'
a
lways print the configure
d
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Nieder
Fi
x
'git var' usage synopsis
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Nieder
M
a
kefi
l
e: always
remove
.
depend directorie
s
on 'm
a
ke
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
J
o
nathan N
i
eder
M
akefile: tuck
a
way
gen
e
rated make
f
ile frag
m
e
n
ts in
.
.
.
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-31
Jo
n
athan Nieder
Do not install shell libraries ex
e
cu
t
able
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nieder
Tea
c
h Makefile
t
o
c
heck h
e
ader dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan Nieder
Makefile: li
s
t
s
tandalone program
o
bject files in PROGRAM_OBJS
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
2010-01-26
Jo
n
a
than Nie
d
er
Ma
k
efile: la
z
ily compute heade
r
dependencies
Signed-off-by:
Jonathan Nieder
<jrnieder@gmail.com>
commit
|
commitdiff
|
tree
next