summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #2381 from ecoffey/example_log_author_filterVicent Marti2014-05-292-8/+47
|\
| * examples/log.c: invert filtering impl and conditionalEoin Coffey2014-05-281-14/+14
| * Remove simple --author, --committer, and --grep from PROJECTSEoin Coffey2014-05-231-6/+0
| * Add support for --grepEoin Coffey2014-05-231-1/+23
| * Add --committer option, and break out helper functionEoin Coffey2014-05-231-7/+21
| * Add support for --author flag in example log implementationEoin Coffey2014-05-221-1/+10
* | Merge pull request #2011 from libgit2/cmn/clone-localVicent Marti2014-05-297-13/+347
|\ \
| * | clone: more explicit local testscmn/clone-localCarlos Martín Nieto2014-05-291-14/+29
| * | clone: allow for linking in local cloneCarlos Martín Nieto2014-05-283-5/+94
| * | fileops: allow linking files when copying directory structuresCarlos Martín Nieto2014-05-283-2/+32
| * | clone: add flag not to linkCarlos Martín Nieto2014-05-283-1/+4
| * | clone: add flags to override whether to perform a local cloneCarlos Martín Nieto2014-05-284-1/+72
| * | clone: store the realpath when given a relative oneCarlos Martín Nieto2014-05-281-1/+10
| * | clone: perform a "local clone" when given a local pathCarlos Martín Nieto2014-05-282-11/+128
* | | Merge pull request #2386 from Therzok/patch-2Russell Belfer2014-05-281-1/+1
|\ \ \
| * | | [Blob] Update documentation for is_binary.Ungureanu Marius2014-05-281-1/+1
|/ / /
* | | Merge pull request #2380 from libgit2/cmn/index-add-modesVicent Marti2014-05-282-0/+29
|\ \ \
| * | | index: check for valid filemodes on addcmn/index-add-modesCarlos Martín Nieto2014-05-222-0/+29
| | |/ | |/|
* | | Merge pull request #2377 from libgit2/cmn/dual-osVicent Marti2014-05-283-4/+23
|\ \ \
| * | | travis: build on osx toocmn/dual-osCarlos Martín Nieto2014-05-213-4/+23
* | | | Merge pull request #2359 from e45lee/chmod-fixVicent Marti2014-05-281-6/+14
|\ \ \ \
| * | | | Address style concerns in setting mkdir/copy flags.Edward Lee2014-05-231-16/+10
| * | | | Fixed permissions on template directories.Edward Lee2014-05-161-7/+21
* | | | | Merge pull request #2385 from karipe/developmentVicent Marti2014-05-282-3/+3
|\ \ \ \ \
| * | | | | Fix compile error on Visual StudioCha, Hojeong2014-05-272-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2337 from ethomson/merge_ffVicent Marti2014-05-283-34/+125
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-273-31/+32
| * | | | Staticify `merge_config`Edward Thomson2014-05-271-1/+1
| * | | | Use a config snapshotEdward Thomson2014-05-271-1/+1
| * | | | Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-273-43/+61
| * | | | Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-273-9/+81
|/ / / /
* | | | Merge pull request #2382 from mikeando/doc_fixesCarlos Martín Nieto2014-05-2610-34/+31
|\ \ \ \
| * | | | Fixed miscellaneous documentation errors.Michael Anderson2014-05-2310-34/+31
|/ / / /
* | | | odb: clear backend errors on successful readCarlos Martín Nieto2014-05-231-0/+1
| |_|/ |/| |
* | | smart: initialize the error variableCarlos Martín Nieto2014-05-221-1/+1
* | | Plug leaks and fix a C99-ismCarlos Martín Nieto2014-05-223-13/+16
* | | Merge pull request #2376 from libgit2/cmn/remote-symrefVicent Marti2014-05-2211-98/+284
|\ \ \
| * | | clone: get rid of head_infocmn/remote-symrefCarlos Martín Nieto2014-05-211-23/+12
| * | | clone: make use of the remote's default branch guessingCarlos Martín Nieto2014-05-211-67/+17
| * | | remote: add api to guess the remote's default branchCarlos Martín Nieto2014-05-213-0/+115
| * | | local transport: expose the symref dataCarlos Martín Nieto2014-05-211-4/+18
| * | | remote: expose the remote's symref mappingsCarlos Martín Nieto2014-05-214-0/+43
| * | | smart: store reported symrefsCarlos Martín Nieto2014-05-213-7/+82
| | |/ | |/|
* | | Merge pull request #2375 from libgit2/rb/safecrlf-on-lf-platformVicent Marti2014-05-223-3/+25
|\ \ \
| * | | Just don't CRLF filter if there are no CRsrb/safecrlf-on-lf-platformRussell Belfer2014-05-191-3/+5
| * | | Make core.safecrlf work on LF-ending platformsRussell Belfer2014-05-193-4/+24
* | | | Merge pull request #2379 from ethomson/status_win32Vicent Marti2014-05-221-2/+3
|\ \ \ \
| * | | | Include windows.h on win32 for SleepEdward Thomson2014-05-211-2/+3
|/ / / /
* | | | Merge pull request #2372 from libgit2/cmn/fetch-terminateVicent Marti2014-05-211-0/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | smart: send a flush when we disconnectcmn/fetch-terminateCarlos Martín Nieto2014-05-201-0/+12
| |/ /