| Commit message (Expand) | Author | Age | Files | Lines |
* | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 1 | -1/+1 |
* | Merge branch 'jk/remote-pushremote-config-reading' into maint | Junio C Hamano | 2014-03-18 | 1 | -1/+6 |
|\ |
|
| * | remote: handle pushremote config in any orderjk/remote-pushremote-config-reading | Jeff King | 2014-02-24 | 1 | -1/+6 |
* | | Merge branch 'mh/retire-ref-fetch-rules' | Junio C Hamano | 2014-01-27 | 1 | -4/+4 |
|\ \ |
|
| * | | refname_match(): always use the rules in ref_rev_parse_rulesmh/retire-ref-fetch-rules@foo | Michael Haggerty | 2014-01-14 | 1 | -4/+4 |
| |/ |
|
* | | Merge branch 'jc/push-refmap' | Junio C Hamano | 2013-12-27 | 1 | -4/+4 |
|\ \ |
|
| * | | push: use remote.$name.push as a refmap | Junio C Hamano | 2013-12-04 | 1 | -4/+4 |
| |/ |
|
* | | Merge branch 'cc/starts-n-ends-with' | Junio C Hamano | 2013-12-17 | 1 | -23/+23 |
|\ \ |
|
| * | | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with | Christian Couder | 2013-12-05 | 1 | -23/+23 |
| |/ |
|
* | | Merge branch 'mh/fetch-tags-in-addition-to-normal-refs' | Junio C Hamano | 2013-12-12 | 1 | -28/+66 |
|\ \
| |/
|/| |
|
| * | fetch: improve the error messages emitted for conflicting refspecsmh/fetch-tags-in-addition-to-normal-refs | Michael Haggerty | 2013-10-30 | 1 | -3/+22 |
| * | handle_duplicate(): mark error message for translation | Michael Haggerty | 2013-10-30 | 1 | -1/+1 |
| * | ref_remote_duplicates(): extract a function handle_duplicate() | Michael Haggerty | 2013-10-30 | 1 | -8/+10 |
| * | ref_remove_duplicates(): simplify loop logic | Michael Haggerty | 2013-10-30 | 1 | -21/+31 |
| * | ref_remove_duplicates(): avoid redundant bisection | Michael Haggerty | 2013-10-30 | 1 | -6/+6 |
| * | query_refspecs(): move some constants out of the loop | Michael Haggerty | 2013-10-30 | 1 | -2/+2 |
| * | get_expanded_map(): avoid memory leak | Michael Haggerty | 2013-10-30 | 1 | -3/+3 |
| * | get_expanded_map(): add docstring | Michael Haggerty | 2013-10-30 | 1 | -0/+7 |
* | | Merge branch 'jk/remote-literal-string-leakfix' | Junio C Hamano | 2013-10-28 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | remote: do not copy "origin" string literaljk/remote-literal-string-leakfix | Jeff King | 2013-10-15 | 1 | -1/+1 |
* | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-09-20 | 1 | -25/+47 |
|\ \ |
|
| * | | status: always show tracking branch even no change | Jiang Xin | 2013-08-26 | 1 | -3/+4 |
| * | | branch: report invalid tracking branch as gone | Jiang Xin | 2013-08-26 | 1 | -25/+46 |
| |/ |
|
* | | Merge branch 'jc/push-cas' | Junio C Hamano | 2013-09-09 | 1 | -13/+162 |
|\ \ |
|
| * | | push --force-with-lease: tie it all together | Junio C Hamano | 2013-07-22 | 1 | -13/+36 |
| * | | push --force-with-lease: implement logic to populate old_sha1_expect[] | Junio C Hamano | 2013-07-22 | 1 | -0/+61 |
| * | | remote.c: add command line option parser for "--force-with-lease" | Junio C Hamano | 2013-07-22 | 1 | -0/+57 |
| * | | cache.h: move remote/connect API out of it | Junio C Hamano | 2013-07-08 | 1 | -0/+8 |
* | | | Merge branch 'ms/fetch-prune-configuration' | Junio C Hamano | 2013-09-09 | 1 | -0/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | fetch: make --prune configurablems/fetch-prune-configuration | Michael Schubert | 2013-07-18 | 1 | -0/+3 |
* | | | Merge branch 'bc/push-match-many-refs' | Junio C Hamano | 2013-07-18 | 1 | -2/+25 |
|\ \ \
| |_|/
|/| | |
|
| * | | remote.c: avoid O(m*n) behavior in match_push_refsbc/push-match-many-refs | Brandon Casey | 2013-07-08 | 1 | -2/+25 |
| |/ |
|
* | | remote: remove dead code in read_branches_file() | Ramkumar Ramachandra | 2013-06-23 | 1 | -19/+4 |
* | | remote: trivial style cleanup | Felipe Contreras | 2013-05-28 | 1 | -2/+1 |
|/ |
|
* | remote.c: introduce branch.<name>.pushremote | Ramkumar Ramachandra | 2013-04-02 | 1 | -0/+4 |
* | remote.c: introduce remote.pushdefault | Ramkumar Ramachandra | 2013-04-02 | 1 | -0/+7 |
* | remote.c: introduce a way to have different remotes for fetch/push | Ramkumar Ramachandra | 2013-04-02 | 1 | -4/+21 |
* | remote.c: simplify a bit of code using git_config_string() | Ramkumar Ramachandra | 2013-04-02 | 1 | -3/+2 |
* | Merge branch 'jc/nobody-sets-src-peer-ref' | Junio C Hamano | 2013-04-01 | 1 | -3/+0 |
|\ |
|
| * | match_push_refs(): nobody sets src->peer_ref anymore | Junio C Hamano | 2013-03-04 | 1 | -3/+0 |
* | | Merge branch 'jc/push-follow-tag' | Junio C Hamano | 2013-03-25 | 1 | -0/+99 |
|\ \ |
|
| * | | push: --follow-tags | Junio C Hamano | 2013-03-05 | 1 | -0/+99 |
| |/ |
|
| * | Merge branch 'jc/fetch-ignore-symref' into maint | Junio C Hamano | 2013-01-11 | 1 | -1/+12 |
| |\ |
|
* | \ | Merge branch 'jc/fetch-raw-sha1' | Junio C Hamano | 2013-03-21 | 1 | -18/+23 |
|\ \ \ |
|
| * | | | fetch: fetch objects by their exact SHA-1 object names | Junio C Hamano | 2013-02-07 | 1 | -1/+11 |
| * | | | parse_fetch_refspec(): clarify the codeflow a bit | Junio C Hamano | 2013-02-07 | 1 | -17/+12 |
* | | | | Merge branch 'jc/push-reject-reasons' | Junio C Hamano | 2013-02-04 | 1 | -23/+19 |
|\ \ \ \ |
|
| * | | | | push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE | Junio C Hamano | 2013-01-24 | 1 | -3/+8 |
| * | | | | push: further simplify the logic to assign rejection reason | Junio C Hamano | 2013-01-24 | 1 | -16/+11 |
| * | | | | push: further clean up fields of "struct ref" | Junio C Hamano | 2013-01-24 | 1 | -10/+6 |